[automerger skipped] Merge 10952656 am: 5570bbf78a -s ours am: 93eca92914 -s ours

am skip reason: Merged-In I3320382b65fcd1fceeb969dd5122c80a6221e4ca with SHA-1 5653bad6a5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/abi-dumps/vndk/+/25090726

Change-Id: If8c2c6f306650eb2becd404afed623b3128654a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 17915e9..c37d7ee 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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2937,7 +2937,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "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" : -16777216,
+     "enum_field_value" : 4278190080,
      "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" : -1073741824,
+     "enum_field_value" : 3221225472,
      "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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "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 f901d93..e86f49f 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" : 0,
+     "enum_field_value" : 4294967296,
      "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" : 0,
+     "enum_field_value" : -281474976710656,
      "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 4e8fa1d..6d7b41a 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 3f95b13..361f894 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 709df67..5367938 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" : 0,
+     "enum_field_value" : 4294967296,
      "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" : 0,
+     "enum_field_value" : -281474976710656,
      "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 9955685..57cca99 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 98503a3..60ead84 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 1f58c7c..881e020 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 827aa92..5560014 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 9551dac..b788925 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 66b06bb..7e65fbc 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 75a5d1e..25beb12 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 ac239e0..470db12 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 639b86b..d2b324c 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 0a44f9c..8ea6dc9 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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3688,7 +3688,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "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" : -16777216,
+     "enum_field_value" : 4278190080,
      "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" : -1073741824,
+     "enum_field_value" : 3221225472,
      "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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "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 0a7b8b3..4ee2016 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,6 +839,31 @@
    "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"
     },
@@ -16849,7 +16874,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -16858,7 +16883,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16873,7 +16898,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -16882,7 +16907,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16897,7 +16922,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -16906,7 +16931,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16921,7 +16946,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -16930,7 +16955,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -37115,7 +37140,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -41679,7 +41704,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -41719,7 +41744,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -41729,7 +41754,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -41739,7 +41764,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -42535,7 +42560,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -42544,7 +42569,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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 900521b..1949b6e 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,6 +5946,12 @@
     },
     {
      "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/config.json b/34/64/arm/source-based/config.json
index 403b4cf..5da2c2b 100644
--- a/34/64/arm/source-based/config.json
+++ b/34/64/arm/source-based/config.json
@@ -1,4 +1,9 @@
 {
+  "global": {
+    "flags": {
+      "advice_only": true
+    }
+  },
   "libbinder": [
     {
       "target_version": "current",
diff --git a/34/64/arm/source-based/libRSCpuRef.so.lsdump b/34/64/arm/source-based/libRSCpuRef.so.lsdump
index c09d212..2a7d184 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -187,7 +187,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -322,7 +322,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -601,7 +601,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -610,7 +610,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5831,7 +5831,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "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/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6113,6 +6113,31 @@
    "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"
     },
@@ -9728,7 +9753,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9746,7 +9771,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9779,7 +9804,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9794,7 +9819,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9812,7 +9837,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9830,7 +9855,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9857,7 +9882,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9893,7 +9918,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9911,7 +9936,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9932,7 +9957,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9956,7 +9981,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9992,7 +10017,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10031,7 +10056,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10067,7 +10092,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10106,7 +10131,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10139,7 +10164,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10157,7 +10182,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10274,7 +10299,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10295,7 +10320,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -21910,7 +21935,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -21919,7 +21944,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -21973,7 +21998,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -21991,7 +22016,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22081,7 +22106,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22090,7 +22115,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22450,7 +22475,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22459,7 +22484,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22468,7 +22493,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22477,7 +22502,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22486,7 +22511,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22495,7 +22520,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22504,7 +22529,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22522,7 +22547,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22531,7 +22556,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22540,7 +22565,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22549,7 +22574,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22558,7 +22583,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22567,7 +22592,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22576,7 +22601,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22585,7 +22610,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22594,7 +22619,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22603,7 +22628,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22666,7 +22691,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22675,7 +22700,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23233,7 +23258,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23278,7 +23303,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23287,7 +23312,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23437,8 +23462,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -23887,8 +23912,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -29893,7 +29918,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -29947,7 +29972,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -30673,7 +30698,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -30723,7 +30748,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -30733,7 +30758,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -34386,7 +34411,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/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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -35616,7 +35641,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -35672,7 +35697,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -36191,7 +36216,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36527,7 +36552,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36920,7 +36945,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -37057,7 +37082,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -45325,7 +45350,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/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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -45406,7 +45431,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/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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -46181,7 +46206,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "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"
     },
     {
      "field_name" : "second",
@@ -46198,7 +46223,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/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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -46208,7 +46233,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "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"
     },
     {
      "field_name" : "second",
@@ -46225,7 +46250,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/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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -55344,7 +55369,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55353,7 +55378,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55368,7 +55393,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55377,7 +55402,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55392,7 +55417,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55401,7 +55426,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55416,7 +55441,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55425,7 +55450,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -126854,7 +126879,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -126863,7 +126888,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -126881,7 +126906,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
-   "name" : "std::__make_tuple_indices<2, 0>",
+   "name" : "std::__make_tuple_indices<2>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "size" : 1,
@@ -148529,7 +148554,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -148569,7 +148594,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -148579,7 +148604,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -148589,7 +148614,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -148692,7 +148717,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -148806,7 +148831,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -148920,7 +148945,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -149019,7 +149044,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -149838,7 +149863,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -149847,7 +149872,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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 6e150ad..c06cd1a 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" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -6156,6 +6156,31 @@
    "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"
     },
@@ -10482,7 +10507,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_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" : "_ZTIj"
@@ -10506,7 +10531,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11193,7 +11218,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -26338,8 +26363,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -32313,7 +32338,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -68415,7 +68440,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<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 debd417..a876bc3 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" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -8468,6 +8468,31 @@
    "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"
     },
@@ -31830,7 +31855,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/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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -37641,8 +37666,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/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",
+   "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",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -37884,8 +37909,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37893,8 +37918,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37902,8 +37927,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37911,8 +37936,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/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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -73430,7 +73455,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -73439,7 +73464,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73454,7 +73479,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -73463,7 +73488,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73478,7 +73503,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -73487,7 +73512,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73502,7 +73527,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -73511,7 +73536,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -124947,7 +124972,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/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -138435,7 +138460,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -138578,7 +138603,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/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146132,7 +146157,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/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv7-a-neon_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -155457,7 +155482,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -155497,7 +155522,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -155507,7 +155532,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -155517,7 +155542,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -156275,7 +156300,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -156284,7 +156309,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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 98fe0b7..a2f7260 100644
--- a/34/64/arm/source-based/libaudioutils.so.lsdump
+++ b/34/64/arm/source-based/libaudioutils.so.lsdump
@@ -1999,6 +1999,14 @@
   },
   {
    "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"
   },
   {
@@ -3190,7 +3198,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3428,119 +3436,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -2080374784,
+     "enum_field_value" : 2214592512,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : -2013265920,
+     "enum_field_value" : 2281701376,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : -2013265919,
+     "enum_field_value" : 2281701377,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : -1879048192,
+     "enum_field_value" : 2415919104,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : -1610612736,
+     "enum_field_value" : 2684354560,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3552,15 +3560,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4363,15 +4371,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -551550977,
+     "enum_field_value" : 3743416319,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4853,99 +4861,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : -2147483137,
+     "enum_field_value" : 2147484159,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : -2147482625,
+     "enum_field_value" : 2147484671,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : -2147481601,
+     "enum_field_value" : 2147485695,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : -2147479553,
+     "enum_field_value" : 2147487743,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : -2147475457,
+     "enum_field_value" : 2147491839,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : -2147467265,
+     "enum_field_value" : 2147500031,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : -2147450881,
+     "enum_field_value" : 2147516415,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : -2147418113,
+     "enum_field_value" : 2147549183,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : -2147352577,
+     "enum_field_value" : 2147614719,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : -2147221505,
+     "enum_field_value" : 2147745791,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : -2146959361,
+     "enum_field_value" : 2148007935,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : -2146435073,
+     "enum_field_value" : 2148532223,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : -2145386497,
+     "enum_field_value" : 2149580799,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : -2143289345,
+     "enum_field_value" : 2151677951,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : -2139095041,
+     "enum_field_value" : 2155872255,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : -2130706433,
+     "enum_field_value" : 2164260863,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4961,7 +4969,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5683,7 +5691,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5758,7 +5766,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5779,7 +5787,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -15166,7 +15174,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfjjjS1_S3_jN7android11audio_utils7details13FILTER_OPTIONEELj32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -16796,7 +16804,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 4,
@@ -16805,7 +16813,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 4,
@@ -16814,7 +16822,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "size" : 4,
@@ -16931,7 +16939,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 4,
@@ -21631,7 +21639,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 96,
@@ -21657,7 +21665,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 160,
@@ -21683,7 +21691,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "size" : 64,
@@ -22021,7 +22029,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
    "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 41f9fe0..f2be966 100644
--- a/34/64/arm/source-based/libbase.so.lsdump
+++ b/34/64/arm/source-based/libbase.so.lsdump
@@ -1048,12 +1048,21 @@
    "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"
   },
   {
@@ -1890,7 +1899,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1941,7 +1950,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2697,7 +2706,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLj500ENSt3__19allocatorIcEEE4growEj",
    "parameters" :
    [
@@ -2731,7 +2740,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLj500ENSt3__19allocatorIwEEE4growEj",
    "parameters" :
    [
@@ -4738,6 +4747,23 @@
    "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" :
@@ -4756,6 +4782,22 @@
   },
   {
    "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" :
    [
@@ -4772,6 +4814,22 @@
   },
   {
    "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 8f7aa51..454efbe 100644
--- a/34/64/arm/source-based/libbinder.so.lsdump
+++ b/34/64/arm/source-based/libbinder.so.lsdump
@@ -73,6 +73,15 @@
    "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]",
@@ -91,15 +100,6 @@
    "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,34 +1066,6 @@
    "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"
   },
   {
@@ -1865,214 +1837,6 @@
    "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"
   },
   {
@@ -2157,12 +1921,21 @@
    "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"
   },
   {
@@ -2328,22 +2101,6 @@
    "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_"
   },
   {
@@ -2359,22 +2116,6 @@
    "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"
   },
   {
@@ -2426,14 +2167,6 @@
    "name" : "_ZN7android6Parcel12restartWriteEj"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android6Parcel12writeAlignedIxEEiT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android6Parcel12writeAlignedIyEEiT_"
-  },
-  {
    "name" : "_ZN7android6Parcel12writeCStringEPKc"
   },
   {
@@ -2572,6 +2305,9 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
+   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
+  },
+  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2779,6 +2515,9 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
+   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
+  },
+  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3316,6 +3055,9 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
+   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
+  },
+  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3526,7 +3268,10 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE"
+  },
+  {
+   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3844,22 +3589,6 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
-  },
-  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -3989,6 +3718,9 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
+   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -4007,14 +3739,6 @@
    "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"
   },
   {
@@ -4198,198 +3922,6 @@
    "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"
   },
   {
@@ -4496,462 +4028,10 @@
   },
   {
    "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_"
   },
   {
@@ -4960,1329 +4040,9 @@
   },
   {
    "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"
   },
   {
@@ -6544,15 +4304,9 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
-   "name" : "_ZN7android16kEnableRecordingE"
-  },
-  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
-   "name" : "_ZN7android20kEnableRpcDevServersE"
-  },
-  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -6989,10 +4743,6 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android10PoolThreadE"
-  },
-  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -7020,10 +4770,6 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android15BpShellCallbackE"
-  },
-  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -7033,14 +4779,6 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android16BpResultReceiverE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
-  },
-  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -7104,14 +4842,6 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -7180,6 +4910,10 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android15RpcTransportRawE"
+  },
+  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -7203,6 +4937,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android18RpcTransportCtxRawE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -8737,7 +6475,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -8788,7 +6526,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -13175,104 +10913,6 @@
    "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" :
@@ -15758,849 +13398,6 @@
    "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" :
@@ -17122,6 +13919,23 @@
    "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" :
@@ -17140,6 +13954,22 @@
   },
   {
    "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" :
    [
@@ -17156,6 +13986,22 @@
   },
   {
    "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" :
    [
@@ -17804,114 +14650,6 @@
    "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" :
@@ -17984,114 +14722,6 @@
    "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" :
@@ -18372,48 +15002,6 @@
    "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" :
@@ -19159,6 +15747,19 @@
    "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" :
@@ -20266,6 +16867,12 @@
    "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" :
@@ -21060,6 +17667,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -21073,6 +17681,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -22873,7 +19482,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIb",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -23019,7 +19628,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE",
    "parameters" :
    [
     {
@@ -23027,7 +19636,23 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
+     "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",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android9RpcServerE"
+    },
+    {
+     "referenced_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24943,6 +21568,19 @@
    "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" :
@@ -25033,46 +21671,6 @@
    "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" :
@@ -26021,1062 +22619,6 @@
    "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" :
@@ -27907,10 +23449,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA20_KDs",
-   "name" : "const char16_t (&)[20]",
-   "referenced_type" : "_ZTIA20_KDs",
-   "self_type" : "_ZTIRA20_KDs",
+   "linker_set_key" : "_ZTIRA1_KDs",
+   "name" : "const char16_t (&)[1]",
+   "referenced_type" : "_ZTIA1_KDs",
+   "self_type" : "_ZTIRA1_KDs",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -28116,7 +23658,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/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_lto-thin/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"
@@ -28816,10 +24358,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
-   "name" : "const android::String16::StaticData<20> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
+   "name" : "const android::String16::StaticData<1> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -30828,8 +26370,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/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",
+   "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",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -33472,10 +29014,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILj20EEE",
-   "name" : "android::StaticString16<20> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILj20EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILj1EEE",
+   "name" : "android::StaticString16<1> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -34156,6 +29698,15 @@
   },
   {
    "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",
@@ -34786,10 +30337,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj20EEE",
-   "name" : "android::String16::StaticData<20> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILj20EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj1EEE",
+   "name" : "android::String16::StaticData<1> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -35622,6 +31173,16 @@
    "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",
@@ -35632,16 +31193,6 @@
    "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",
@@ -37890,11 +33441,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "name" : "const android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "name" : "const android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -38014,7 +33565,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 176,
+   "size" : 200,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -39415,6 +34966,46 @@
      "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",
@@ -50492,15 +46083,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILj20EEE",
-   "name" : "android::StaticString16<20>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILj1EEE",
+   "name" : "android::StaticString16<1>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "size" : 48,
+   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "size" : 12,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -53971,7 +49562,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/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/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/native/libs/binder/Binder.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -54021,6 +49612,34 @@
     {
      "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"
     },
     {
@@ -61503,6 +57122,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 408,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -63604,14 +59229,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA20_Ds"
+     "referenced_type" : "_ZTIA1_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "name" : "android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "name" : "android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -64053,7 +59678,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 576,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
     },
     {
      "access" : "private",
@@ -64063,26 +59688,32 @@
     },
     {
      "access" : "private",
-     "field_name" : "mSessions",
+     "field_name" : "mServerSocketModifier",
      "field_offset" : 960,
+     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSessions",
+     "field_offset" : 1152,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 1056,
+     "field_offset" : 1248,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 1088,
+     "field_offset" : 1280,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 1152,
+     "field_offset" : 1344,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -64091,12 +59722,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 176,
+   "size" : 200,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 168,
+     "component_value" : 192,
      "kind" : "vbase_offset"
     },
     {
@@ -64133,11 +59764,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -168,
+     "component_value" : -192,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -168,
+     "component_value" : -192,
      "kind" : "offset_to_top"
     },
     {
@@ -65284,10 +60915,10 @@
   },
   {
    "alignment" : 4,
-   "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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -65320,6 +60951,15 @@
   },
   {
    "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 3f3f12f..1bae4a3 100644
--- a/34/64/arm/source-based/libc++.so.lsdump
+++ b/34/64/arm/source-based/libc++.so.lsdump
@@ -2596,14 +2596,6 @@
    "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_"
   },
   {
@@ -3766,10 +3758,6 @@
    "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"
   },
   {
@@ -4410,34 +4398,10 @@
   },
   {
    "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_"
   },
   {
@@ -4453,22 +4417,6 @@
    "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"
   },
   {
@@ -4644,10 +4592,6 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcj"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv"
-  },
-  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -5036,34 +4980,10 @@
   },
   {
    "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_"
   },
   {
@@ -5080,50 +5000,10 @@
   },
   {
    "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_"
   },
   {
@@ -5140,22 +5020,6 @@
   },
   {
    "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_"
   },
   {
@@ -9938,7 +9802,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_grouping",
+   "function_name" : "std::moneypunct<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9952,7 +9816,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9966,7 +9830,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9980,7 +9844,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -9994,7 +9858,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10008,7 +9872,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10022,7 +9886,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10036,7 +9900,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10050,7 +9914,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10190,7 +10054,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10204,7 +10068,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10218,7 +10082,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10232,7 +10096,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10246,7 +10110,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10260,7 +10124,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10274,7 +10138,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10288,7 +10152,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10302,7 +10166,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13221,7 +13085,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13235,7 +13099,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13249,7 +13113,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13263,7 +13127,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13277,7 +13141,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13291,7 +13155,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13305,7 +13169,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13319,7 +13183,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13333,7 +13197,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13473,7 +13337,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13487,7 +13351,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13501,7 +13365,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13515,7 +13379,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13529,7 +13393,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13543,7 +13407,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13557,7 +13421,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13571,7 +13435,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13585,7 +13449,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20316,50 +20180,6 @@
    "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" :
@@ -25790,25 +25610,6 @@
    "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" :
@@ -28559,7 +28360,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char, false>::init",
+   "function_name" : "std::moneypunct_byname<char>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28593,7 +28394,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28627,121 +28428,6 @@
   },
   {
    "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" :
    [
@@ -28765,29 +28451,6 @@
   },
   {
    "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" :
    [
@@ -28879,98 +28542,6 @@
    ]
   },
   {
-   "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",
@@ -29782,19 +29353,6 @@
    "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" :
@@ -31835,136 +31393,6 @@
   },
   {
    "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" :
    [
@@ -31991,32 +31419,6 @@
   },
   {
    "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" :
    [
@@ -32120,255 +31522,6 @@
    ]
   },
   {
-   "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" :
@@ -32399,35 +31552,6 @@
   },
   {
    "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" :
    [
@@ -32543,122 +31667,6 @@
    ]
   },
   {
-   "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" :
@@ -35555,13 +34563,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char, false>::id",
+   "name" : "std::moneypunct<char>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char, false>::intl",
+   "name" : "std::moneypunct<char>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -35579,13 +34587,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t, false>::id",
+   "name" : "std::moneypunct<wchar_t>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t, false>::intl",
+   "name" : "std::moneypunct<wchar_t>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -55133,7 +54141,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55142,7 +54150,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55157,7 +54165,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55166,7 +54174,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55181,7 +54189,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55190,7 +54198,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55205,7 +54213,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55214,7 +54222,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -115259,7 +114267,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -115268,7 +114276,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -135523,7 +134531,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -135533,7 +134541,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
-   "name" : "std::ratio<1000000, 1>",
+   "name" : "std::ratio<1000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
@@ -135573,7 +134581,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -135583,7 +134591,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -135593,7 +134601,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -136705,7 +135713,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<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,
@@ -136714,7 +135722,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<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,
@@ -136723,7 +135731,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<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,
@@ -136737,7 +135745,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -136746,7 +135754,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<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,
@@ -136783,7 +135791,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__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,
@@ -136792,7 +135800,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__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,
@@ -136829,7 +135837,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__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,
@@ -136838,7 +135846,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__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,
@@ -136875,7 +135883,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__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,
@@ -136884,7 +135892,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__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,
@@ -136921,7 +135929,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__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,
@@ -136930,7 +135938,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__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,
@@ -136967,7 +135975,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -136976,7 +135984,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -137045,7 +136053,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -137054,7 +136062,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -137169,7 +136177,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -137178,7 +136186,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<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 31579a5..97b70a7 100644
--- a/34/64/arm/source-based/libcap.so.lsdump
+++ b/34/64/arm/source-based/libcap.so.lsdump
@@ -50,9 +50,6 @@
  "elf_functions" :
  [
   {
-   "name" : "_libcap_strdup"
-  },
-  {
    "name" : "cap_clear"
   },
   {
@@ -80,6 +77,9 @@
    "name" : "cap_fill"
   },
   {
+   "name" : "cap_fill_flag"
+  },
+  {
    "name" : "cap_free"
   },
   {
@@ -122,12 +122,21 @@
    "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"
   },
   {
@@ -185,6 +194,9 @@
    "name" : "cap_prctlw"
   },
   {
+   "name" : "cap_proc_root"
+  },
+  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -522,6 +534,27 @@
    "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" :
@@ -684,6 +717,33 @@
    "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" :
@@ -717,6 +777,18 @@
    "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",
@@ -824,7 +896,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -839,7 +911,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -869,7 +941,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -890,7 +962,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -905,7 +977,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -999,6 +1071,18 @@
    "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 90236a9..3c7778b 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1269,7 +1269,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "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/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/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" : -16,
+     "enum_field_value" : 18446744073709551600,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3619,7 +3619,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3977,7 +3977,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "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" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4281,11 +4281,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6757,7 +6757,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7450,7 +7450,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7792,7 +7792,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7801,7 +7801,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -8226,7 +8226,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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 c1f237f..b5944b7 100644
--- a/34/64/arm/source-based/libcrypto.so.lsdump
+++ b/34/64/arm/source-based/libcrypto.so.lsdump
@@ -38,15 +38,6 @@
    "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]",
@@ -120,11 +111,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -613,6 +604,9 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
+   "name" : "ASN1_TIME_set_string_X509"
+  },
+  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1864,18 +1858,6 @@
    "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"
   },
   {
@@ -2626,6 +2608,18 @@
    "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"
   },
   {
@@ -3082,6 +3076,15 @@
    "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"
   },
   {
@@ -3517,6 +3520,9 @@
    "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"
   },
   {
@@ -3736,6 +3742,9 @@
    "name" : "EVP_sha256"
   },
   {
+   "name" : "EVP_sha256_final_with_secret_suffix"
+  },
+  {
    "name" : "EVP_sha384"
   },
   {
@@ -4183,6 +4192,69 @@
    "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"
   },
   {
@@ -4789,6 +4861,27 @@
    "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"
   },
   {
@@ -7378,36 +7471,9 @@
    "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"
   },
   {
@@ -7426,24 +7492,9 @@
    "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"
   },
   {
@@ -8508,23 +8559,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8888,6 +8939,30 @@
      "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"
     },
     {
@@ -10388,6 +10463,21 @@
    "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" :
@@ -16277,6 +16367,21 @@
    "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" :
@@ -17336,6 +17441,135 @@
    "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" :
@@ -19220,6 +19454,12 @@
    "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",
@@ -20744,6 +20984,318 @@
    "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" :
@@ -27259,10 +27811,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27331,7 +27883,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29347,7 +29899,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30136,7 +30688,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31381,7 +31933,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31402,7 +31954,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -35756,114 +36308,6 @@
    "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" :
@@ -35876,48 +36320,6 @@
    "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",
@@ -35996,66 +36398,6 @@
    "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" :
@@ -36071,18 +36413,6 @@
    "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" :
@@ -36913,24 +37243,6 @@
   },
   {
    "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",
@@ -37048,6 +37360,15 @@
   },
   {
    "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",
@@ -37939,10 +38260,10 @@
   },
   {
    "alignment" : 4,
-   "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",
+   "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",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38094,6 +38415,15 @@
    "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,
@@ -38364,6 +38694,15 @@
    "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,
@@ -39145,12 +39484,21 @@
   },
   {
    "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/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
   {
    "alignment" : 4,
@@ -39352,15 +39700,6 @@
   },
   {
    "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",
@@ -39762,7 +40101,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
    "alignment" : 4,
@@ -39834,7 +40173,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/bio.h"
   },
   {
    "alignment" : 4,
@@ -39914,7 +40253,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 344,
+   "size" : 480,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40236,7 +40575,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 720,
+   "size" : 704,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40256,7 +40595,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 36,
+   "size" : 44,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40656,17 +40995,15 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 84,
+   "size" : 76,
    "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"
   },
   {
@@ -40788,12 +41125,22 @@
    "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/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
   {
    "alignment" : 8,
@@ -41046,6 +41393,42 @@
     {
      "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"
     },
     {
@@ -42195,7 +42578,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4736,
+     "field_offset" : 4608,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42203,7 +42586,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42231,22 +42614,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4928,
+     "field_offset" : 4800,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5120,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5632,
+     "field_offset" : 5504,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5696,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42254,7 +42637,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 720,
+   "size" : 704,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42547,7 +42930,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
+     "referenced_type" : "_ZTIA128_h"
     },
     {
      "field_name" : "block_used",
@@ -43077,7 +43460,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -43089,7 +43472,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 584,
+   "size" : 568,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43278,249 +43661,6 @@
    "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"
     },
@@ -43801,28 +43941,6 @@
    "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 ea0189e..a9ad8f0 100644
--- a/34/64/arm/source-based/libcrypto_utils.so.lsdump
+++ b/34/64/arm/source-based/libcrypto_utils.so.lsdump
@@ -137,13 +137,11 @@
  "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 7d0984d..9f96b7f 100644
--- a/34/64/arm/source-based/libcurl.so.lsdump
+++ b/34/64/arm/source-based/libcurl.so.lsdump
@@ -112,12 +112,6 @@
    "name" : "Curl_all_content_encodings"
   },
   {
-   "name" : "Curl_alpn_get_proxy_spec"
-  },
-  {
-   "name" : "Curl_alpn_get_spec"
-  },
-  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -208,9 +202,81 @@
    "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"
   },
   {
@@ -280,6 +346,9 @@
    "name" : "Curl_cf_def_send"
   },
   {
+   "name" : "Curl_cf_h1_proxy_insert_after"
+  },
+  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -292,6 +361,9 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
+   "name" : "Curl_cf_http_proxy_get_host"
+  },
+  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -367,15 +439,15 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard"
-  },
-  {
    "name" : "Curl_conn_cf_discard_all"
   },
   {
    "name" : "Curl_conn_cf_discard_chain"
   },
   {
+   "name" : "Curl_conn_cf_discard_sub"
+  },
+  {
    "name" : "Curl_conn_cf_get_select_socks"
   },
   {
@@ -385,6 +457,9 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
+   "name" : "Curl_conn_cf_is_ssl"
+  },
+  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -439,9 +514,6 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
-   "name" : "Curl_conn_http_proxy_add"
-  },
-  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -610,6 +682,72 @@
    "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"
   },
   {
@@ -682,6 +820,15 @@
    "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"
   },
   {
@@ -784,6 +931,9 @@
    "name" : "Curl_http_cookies"
   },
   {
+   "name" : "Curl_http_decode_status"
+  },
+  {
    "name" : "Curl_http_done"
   },
   {
@@ -811,6 +961,24 @@
    "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"
   },
   {
@@ -1486,6 +1654,9 @@
    "name" : "Curl_updatesocket"
   },
   {
+   "name" : "Curl_url_set_authority"
+  },
+  {
    "name" : "Curl_urldecode"
   },
   {
@@ -1849,6 +2020,9 @@
    "name" : "Curl_cfree"
   },
   {
+   "name" : "Curl_cft_h1_proxy"
+  },
+  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4256,6 +4430,10 @@
      "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
deleted file mode 100644
index d5b31cf..0000000
--- a/34/64/arm/source-based/libdiskconfig.so.lsdump
+++ /dev/null
@@ -1,642 +0,0 @@
-{
- "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 78752ee..bbfc72b 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" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1553,7 +1553,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "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 b5b80ef..b787134 100644
--- a/34/64/arm/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/arm/source-based/libdumpstateutil.so.lsdump
@@ -153,6 +153,9 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -202,6 +205,9 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -574,6 +580,12 @@
    "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",
@@ -712,6 +724,13 @@
   },
   {
    "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 6162eda..dc63f8b 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 263dbf1..e7be079 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -975,7 +975,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -993,7 +993,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1070,7 +1070,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1129,7 +1129,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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 74efb8a..2760fbc 100644
--- a/34/64/arm/source-based/libhidlbase.so.lsdump
+++ b/34/64/arm/source-based/libhidlbase.so.lsdump
@@ -264,14 +264,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -284,10 +276,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -300,10 +288,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -312,11 +296,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
   },
   {
    "binding" : "weak",
@@ -1890,22 +1874,6 @@
    "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"
   },
   {
@@ -1921,22 +1889,6 @@
    "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"
   },
   {
@@ -2398,26 +2350,6 @@
   },
   {
    "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"
   },
   {
@@ -2821,10 +2753,6 @@
   },
   {
    "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"
   },
   {
@@ -2841,10 +2769,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2905,10 +2829,6 @@
   },
   {
    "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_"
   },
   {
@@ -2917,10 +2837,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__18functionIFbbEEclEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__18functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS7_S7_S7_PNS_6vectorIPvNS_9allocatorIS9_EEEEEEclES5_S7_S7_S7_S7_SD_"
   },
   {
@@ -2929,14 +2845,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
   },
   {
@@ -2945,6 +2853,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -2957,18 +2869,10 @@
   },
   {
    "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_"
   },
   {
@@ -2985,14 +2889,6 @@
   },
   {
    "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"
   },
   {
@@ -3029,10 +2925,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -3077,6 +2969,10 @@
   },
   {
    "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_"
   },
   {
@@ -3093,10 +2989,6 @@
   },
   {
    "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"
   },
   {
@@ -3105,22 +2997,10 @@
   },
   {
    "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"
   },
   {
@@ -3129,14 +3009,6 @@
   },
   {
    "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_"
   },
   {
@@ -3145,30 +3017,14 @@
   },
   {
    "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"
   },
   {
@@ -3181,10 +3037,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseIPKcNS_9allocatorIS2_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIPvNS_9allocatorIS1_EEED2Ev"
   },
   {
@@ -3193,14 +3045,6 @@
   },
   {
    "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"
   },
   {
@@ -3253,7 +3097,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3265,54 +3113,10 @@
   },
   {
    "binding" : "weak",
-   "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",
    "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEED2Ev"
   },
   {
    "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_"
   },
   {
@@ -3333,10 +3137,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3345,10 +3145,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3357,19 +3153,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3437,26 +3229,10 @@
   },
   {
    "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_"
   },
   {
@@ -3493,70 +3269,18 @@
   },
   {
    "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_"
   },
   {
@@ -3573,10 +3297,6 @@
   },
   {
    "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_"
   },
   {
@@ -3589,11 +3309,7 @@
   },
   {
    "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_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_"
+   "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",
@@ -3609,14 +3325,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_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_"
   },
   {
@@ -3637,19 +3345,15 @@
   },
   {
    "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_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEEiEEbEERKT_DpOT0_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -3665,14 +3369,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIRKS6_EEvOT_"
   },
   {
@@ -3685,10 +3381,6 @@
   },
   {
    "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_"
   },
   {
@@ -3697,18 +3389,6 @@
   },
   {
    "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"
   },
   {
@@ -3733,18 +3413,10 @@
   },
   {
    "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"
   },
   {
@@ -3785,22 +3457,10 @@
   },
   {
    "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_"
   },
   {
@@ -3809,14 +3469,6 @@
   },
   {
    "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"
   },
   {
@@ -3825,10 +3477,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -4117,10 +3765,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -4152,10 +3796,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -4241,10 +3881,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -4392,10 +4028,6 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
-  },
-  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4405,10 +4037,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4418,10 +4046,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4448,10 +4072,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8836,42 +8456,6 @@
    "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" :
@@ -8920,22 +8504,6 @@
    "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" :
@@ -8985,22 +8553,6 @@
   },
   {
    "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" :
    [
@@ -9033,22 +8585,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "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_8hardware27hidl_binder_death_recipientEEE"
-    },
-    {
-     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-    }
-   ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::IBinder>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
@@ -9065,6 +8601,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::wp<android::hardware::BHwBinder>::operator=",
    "linker_set_key" : "_ZN7android2wpINS_8hardware9BHwBinderEEaSERKS3_",
    "parameters" :
@@ -17395,118 +16947,6 @@
    "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" :
@@ -17597,118 +17037,6 @@
    "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" :
@@ -19723,91 +19051,6 @@
   },
   {
    "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" :
    [
@@ -22177,8 +21420,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/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",
+   "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",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -23528,7 +22771,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/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/e560d7b19ebf7276b3e850d3d346dec8/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 2a372d8..ae131fb 100644
--- a/34/64/arm/source-based/libmedia_helper.so.lsdump
+++ b/34/64/arm/source-based/libmedia_helper.so.lsdump
@@ -668,21 +668,33 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10valueHacOnE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
+   "name" : "_ZN7android14AudioParameter11valueHacOffE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
+   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -704,6 +716,15 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -713,6 +734,9 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
+   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1426,12 +1450,24 @@
    "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",
@@ -1444,6 +1480,12 @@
    "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",
@@ -1456,6 +1498,12 @@
    "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",
@@ -1498,6 +1546,24 @@
    "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",
@@ -1516,6 +1582,12 @@
    "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 449d96a..97779e6 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5549,7 +5549,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "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/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/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" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -10606,11 +10606,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17047,7 +17047,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -18887,6 +18887,15 @@
   },
   {
    "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",
@@ -18995,6 +19004,15 @@
   },
   {
    "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",
@@ -20341,7 +20359,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20368,7 +20386,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -20548,7 +20566,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20578,7 +20596,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22353,11 +22371,13 @@
    "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"
   },
   {
@@ -23165,7 +23185,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23221,7 +23241,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23406,7 +23426,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23550,7 +23570,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23843,7 +23863,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24225,7 +24245,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -35344,6 +35364,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 408,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -43448,6 +43474,15 @@
   },
   {
    "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 87c11b1..437b741 100644
--- a/34/64/arm/source-based/libprocessgroup.so.lsdump
+++ b/34/64/arm/source-based/libprocessgroup.so.lsdump
@@ -146,6 +146,9 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
+   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
+  },
+  {
    "name" : "_Z24sendSignalToProcessGroupjii"
   },
   {
@@ -247,7 +250,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1135,9 +1138,15 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1153,9 +1162,15 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1168,12 +1183,18 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1201,21 +1222,42 @@
    "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 4e71874..4282a1d 100644
--- a/34/64/arm/source-based/libsqlite.so.lsdump
+++ b/34/64/arm/source-based/libsqlite.so.lsdump
@@ -337,6 +337,9 @@
    "name" : "sqlite3_interrupt"
   },
   {
+   "name" : "sqlite3_is_interrupted"
+  },
+  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -691,6 +694,9 @@
    "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 68b05f4..ba49978 100644
--- a/34/64/arm/source-based/libssl.so.lsdump
+++ b/34/64/arm/source-based/libssl.so.lsdump
@@ -20,6 +20,15 @@
    "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]",
@@ -65,6 +74,15 @@
    "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]",
@@ -119,6 +137,15 @@
    "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]",
@@ -165,11 +192,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -200,6 +227,24 @@
    "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]",
@@ -512,6 +557,9 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
+   "name" : "SSL_CIPHER_get_handshake_digest"
+  },
+  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -536,9 +584,6 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
-   "name" : "SSL_CIPHER_get_value"
-  },
-  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -803,6 +848,9 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
+   "name" : "SSL_CTX_set1_group_ids"
+  },
+  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1364,6 +1412,24 @@
    "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"
   },
   {
@@ -1424,6 +1490,12 @@
    "name" : "SSL_get_finished"
   },
   {
+   "name" : "SSL_get_group_id"
+  },
+  {
+   "name" : "SSL_get_group_name"
+  },
+  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1445,6 +1517,9 @@
    "name" : "SSL_get_mode"
   },
   {
+   "name" : "SSL_get_negotiated_group"
+  },
+  {
    "name" : "SSL_get_options"
   },
   {
@@ -1715,6 +1790,9 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
+   "name" : "SSL_set1_group_ids"
+  },
+  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2093,6 +2171,9 @@
    "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"
   },
   {
@@ -6700,6 +6781,18 @@
    "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" :
@@ -6796,18 +6889,6 @@
    "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" :
@@ -7966,6 +8047,24 @@
    "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" :
@@ -10801,6 +10900,96 @@
    "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" :
@@ -11068,6 +11257,30 @@
    "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" :
@@ -11161,6 +11374,18 @@
    "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" :
@@ -12418,6 +12643,24 @@
    "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" :
@@ -14244,6 +14487,15 @@
   },
   {
    "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",
@@ -14271,6 +14523,15 @@
   },
   {
    "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",
@@ -14316,6 +14577,15 @@
   },
   {
    "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",
@@ -14325,6 +14595,15 @@
   },
   {
    "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",
@@ -14343,6 +14622,24 @@
   },
   {
    "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",
@@ -14370,6 +14667,24 @@
   },
   {
    "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",
@@ -14379,6 +14694,33 @@
   },
   {
    "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",
@@ -14532,6 +14874,15 @@
   },
   {
    "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",
@@ -14622,6 +14973,15 @@
   },
   {
    "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",
@@ -14742,15 +15102,6 @@
   },
   {
    "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",
@@ -14994,15 +15345,6 @@
   },
   {
    "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",
@@ -18225,6 +18567,15 @@
   },
   {
    "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",
@@ -18468,6 +18819,15 @@
   },
   {
    "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",
@@ -18477,6 +18837,15 @@
   },
   {
    "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",
@@ -18486,6 +18855,24 @@
   },
   {
    "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",
@@ -18531,6 +18918,15 @@
   },
   {
    "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",
@@ -19107,6 +19503,15 @@
   },
   {
    "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",
@@ -19116,6 +19521,24 @@
   },
   {
    "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",
@@ -19161,6 +19584,15 @@
   },
   {
    "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",
@@ -19323,15 +19755,6 @@
   },
   {
    "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",
@@ -19364,7 +19787,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
    "alignment" : 4,
@@ -19400,7 +19823,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 4,
@@ -19470,6 +19893,16 @@
    "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",
@@ -19500,6 +19933,16 @@
    "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",
@@ -19540,6 +19983,16 @@
    "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",
@@ -19570,6 +20023,26 @@
    "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",
@@ -19870,7 +20343,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20196,6 +20669,16 @@
    "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",
@@ -20368,13 +20851,11 @@
    "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"
   },
   {
@@ -20426,7 +20907,17 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 32,
+   "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,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20442,6 +20933,16 @@
   {
    "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",
@@ -20452,6 +20953,26 @@
   {
    "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",
@@ -20502,6 +21023,16 @@
   {
    "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",
@@ -20546,7 +21077,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" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22335,7 +22866,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4736,
+     "field_offset" : 4608,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22343,7 +22874,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22371,22 +22902,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4928,
+     "field_offset" : 4800,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5120,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5632,
+     "field_offset" : 5504,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5696,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22394,7 +22925,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 720,
+   "size" : 704,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23160,7 +23691,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -23172,7 +23703,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 584,
+   "size" : 568,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -23499,249 +24030,6 @@
    "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"
     },
@@ -24150,6 +24438,41 @@
    [
     {
      "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"
     }
    ],
@@ -24185,6 +24508,76 @@
    [
     {
      "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"
     }
    ],
@@ -24360,6 +24753,41 @@
    [
     {
      "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"
     }
    ],
@@ -26045,7 +26473,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" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26068,7 +26496,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" : 720,
+   "size" : 704,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26333,6 +26761,20 @@
   },
   {
    "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",
@@ -26347,6 +26789,34 @@
   },
   {
    "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 3e99ca8..95490f4 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" : 24,
+   "size" : 28,
    "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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6718,13 +6718,19 @@
      "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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6815,13 +6821,19 @@
      "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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9084,7 +9096,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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9103,7 +9115,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" : 24,
+   "size" : 28,
    "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 42b7a77..1e7b46a 100644
--- a/34/64/arm/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/34/64/arm/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -983,6 +983,9 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
+   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy"
   },
   {
@@ -11698,11 +11701,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12289,11 +12292,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12874,11 +12877,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14471,6 +14474,37 @@
   },
   {
    "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 c3f8aa5..8470613 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/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/e560d7b19ebf7276b3e850d3d346dec8/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/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/e560d7b19ebf7276b3e850d3d346dec8/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/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/e560d7b19ebf7276b3e850d3d346dec8/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 429b7f8..e9fdab9 100644
--- a/34/64/arm/source-based/libstagefright_omx.so.lsdump
+++ b/34/64/arm/source-based/libstagefright_omx.so.lsdump
@@ -643,6 +643,9 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
+   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy"
   },
   {
@@ -15369,6 +15372,37 @@
   },
   {
    "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" :
    [
@@ -43248,6 +43282,15 @@
   },
   {
    "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 b894d82..c6dec2f 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24586,6 +24586,12 @@
     },
     {
      "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 af0870a..1480e65 100644
--- a/34/64/arm/source-based/libtinyalsa.so.lsdump
+++ b/34/64/arm/source-based/libtinyalsa.so.lsdump
@@ -219,6 +219,9 @@
    "name" : "pcm_get_subdevice"
   },
   {
+   "name" : "pcm_get_xruns"
+  },
+  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1299,6 +1302,18 @@
    "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 dca11b4..955d6e9 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -860,10 +860,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -872,18 +868,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1214,6 +1202,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1454,10 +1446,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common14ExtendableTypeEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common9DataspaceEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
   },
   {
@@ -1466,21 +1454,9 @@
   },
   {
    "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"
   },
   {
@@ -1508,10 +1484,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1528,10 +1500,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1551,10 +1519,6 @@
    "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"
   },
   {
@@ -2343,10 +2307,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_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_"
   },
   {
@@ -2375,10 +2335,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common14ExtendableTypeENS_9allocatorIS6_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEED2Ev"
   },
   {
@@ -2387,31 +2343,15 @@
   },
   {
    "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_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EjjS9_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lj4EEEEC2EjjS5_"
   },
   {
    "binding" : "weak",
@@ -2419,14 +2359,6 @@
   },
   {
    "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_"
   },
   {
@@ -2455,10 +2387,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLj128EEEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2507,30 +2435,14 @@
   },
   {
    "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_"
   },
   {
@@ -2543,26 +2455,10 @@
   },
   {
    "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_"
   },
   {
@@ -2571,15 +2467,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEj"
   },
   {
    "binding" : "weak",
@@ -2595,10 +2487,6 @@
   },
   {
    "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_"
   },
   {
@@ -2619,14 +2507,6 @@
   },
   {
    "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"
   },
   {
@@ -2635,10 +2515,6 @@
   },
   {
    "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_"
   },
   {
@@ -2647,14 +2523,6 @@
   },
   {
    "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"
   },
   {
@@ -2667,26 +2535,10 @@
   },
   {
    "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"
   },
   {
@@ -2695,18 +2547,6 @@
   },
   {
    "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"
   },
   {
@@ -4032,7 +3872,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -4048,11 +3888,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -4061,7 +3901,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4253,7 +4093,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4269,71 +4109,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4653,7 +4493,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4661,7 +4501,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7423,7 +7263,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8405,11 +8245,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8996,11 +8836,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9581,11 +9421,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10897,7 +10737,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10915,7 +10755,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10948,7 +10788,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10963,7 +10803,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10981,7 +10821,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10999,7 +10839,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11026,7 +10866,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11071,7 +10911,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11089,7 +10929,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11110,7 +10950,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11134,7 +10974,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11170,7 +11010,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11209,7 +11049,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11245,7 +11085,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11284,7 +11124,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11317,7 +11157,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11335,7 +11175,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11371,7 +11211,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11392,7 +11232,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14538,19 +14378,6 @@
    "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" :
@@ -14580,22 +14407,6 @@
    "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" :
@@ -14612,22 +14423,6 @@
    "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" :
@@ -16310,6 +16105,12 @@
    "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" :
@@ -22227,7 +22028,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22236,7 +22037,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22281,7 +22082,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22317,7 +22118,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22326,7 +22127,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22416,7 +22217,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22425,7 +22226,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22434,7 +22235,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22443,7 +22244,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22452,7 +22253,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22461,7 +22262,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22470,7 +22271,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22488,7 +22289,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22497,7 +22298,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22506,7 +22307,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22515,7 +22316,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22524,7 +22325,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22533,7 +22334,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22542,7 +22343,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22551,7 +22352,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22560,7 +22361,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22569,7 +22370,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22587,7 +22388,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22596,7 +22397,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22623,7 +22424,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22650,7 +22451,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25575,7 +25376,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25706,7 +25507,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25744,7 +25545,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28281,7 +28082,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28337,7 +28138,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28501,7 +28302,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28598,7 +28399,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28757,7 +28558,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28945,7 +28746,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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 976dd97..913d8c1 100644
--- a/34/64/arm/source-based/libunwindstack.so.lsdump
+++ b/34/64/arm/source-based/libunwindstack.so.lsdump
@@ -101,24 +101,6 @@
    "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]",
@@ -245,414 +227,381 @@
  "elf_functions" :
  [
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
+   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
+   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
   },
   {
-   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
   },
   {
-   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_GetGR"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
   },
   {
-   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_SetGR"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
   },
   {
-   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_SetIP"
+   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind17__Unwind_GetIPInfo"
+   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_GetGR"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
+   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_SetGR"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
+   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_SetIP"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind17__Unwind_GetIPInfo"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
+   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
+  },
+  {
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_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" : "_RNvXs7_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Cs3jb9llYclZH_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
+   "name" : "_RNvXs7_Csc3gp0nclRww_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
+   "name" : "_RNvXs7_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXsC_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
    "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE"
-  },
-  {
-   "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"
   },
   {
@@ -2541,45 +2490,6 @@
    "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"
   },
   {
@@ -3332,10 +3242,13 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
   },
   {
    "binding" : "weak",
@@ -3404,9 +3317,6 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
-   "name" : "_ZTVN11unwindstack10RegsMips64E"
-  },
-  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3598,9 +3508,6 @@
    "name" : "_ZTVN11unwindstack8RegsImplIyEE"
   },
   {
-   "name" : "_ZTVN11unwindstack8RegsMipsE"
-  },
-  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3664,6 +3571,9 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
+  },
+  {
+   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3835,48 +3745,6 @@
    "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" :
    [
@@ -4207,163 +4075,6 @@
    "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" :
    [
@@ -4389,14 +4100,6 @@
     },
     {
      "enum_field_value" : 5,
-     "name" : "unwindstack::ARCH_MIPS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "unwindstack::ARCH_MIPS64"
-    },
-    {
-     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4664,163 +4367,6 @@
    [
     {
      "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"
     },
     {
@@ -4926,194 +4472,6 @@
    "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" :
@@ -7845,194 +7203,6 @@
    "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",
@@ -8965,15 +8135,6 @@
   },
   {
    "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",
@@ -9334,15 +8495,6 @@
   },
   {
    "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",
@@ -9859,82 +9011,6 @@
      "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",
@@ -10658,32 +9734,6 @@
    "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" :
    [
@@ -11030,48 +10080,6 @@
      "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"
@@ -11465,68 +10473,6 @@
   },
   {
    "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" :
    [
     {
@@ -11929,22 +10875,6 @@
    "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"
     }
@@ -12107,103 +11037,6 @@
    "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"
     }
@@ -13787,82 +12620,6 @@
   },
   {
    "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 73ceb4e..f7476d5 100644
--- a/34/64/arm/source-based/libutils.so.lsdump
+++ b/34/64/arm/source-based/libutils.so.lsdump
@@ -493,10 +493,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -508,10 +504,6 @@
    "name" : "_ZN7android2spINS_6ThreadEE5clearEv"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_6ThreadEEaSEOS2_"
-  },
-  {
    "name" : "_ZN7android30get_report_sysprop_change_funcEv"
   },
   {
@@ -746,9 +738,6 @@
    "name" : "_ZN7android7String813appendFormatVEPKcSt9__va_list"
   },
   {
-   "name" : "_ZN7android7String816convertToResPathEv"
-  },
-  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1227,10 +1216,6 @@
   },
   {
    "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_"
   },
   {
@@ -1255,10 +1240,6 @@
   },
   {
    "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_"
   },
   {
@@ -1271,10 +1252,6 @@
   },
   {
    "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"
   },
   {
@@ -5764,19 +5741,6 @@
    "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" :
@@ -5822,22 +5786,6 @@
    "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" :
@@ -7068,19 +7016,6 @@
    "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 95087ca..e54cd23 100644
--- a/34/64/arm/source-based/libxml2.so.lsdump
+++ b/34/64/arm/source-based/libxml2.so.lsdump
@@ -719,6 +719,9 @@
    "name" : "xmlCtxtResetPush"
   },
   {
+   "name" : "xmlCtxtSetMaxAmplification"
+  },
+  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1403,6 +1406,9 @@
    "name" : "xmlMemShow"
   },
   {
+   "name" : "xmlMemSize"
+  },
+  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1916,6 +1922,9 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
+   "name" : "xmlParserInputBufferCreateString"
+  },
+  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3002,6 +3011,9 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
+   "name" : "xmlTextReaderSetMaxAmplification"
+  },
+  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5390,6 +5402,43 @@
    "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"
     },
@@ -5972,6 +6021,10 @@
      "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"
     },
@@ -9491,6 +9544,10 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -13971,6 +14028,21 @@
    "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" :
@@ -17220,6 +17292,18 @@
    "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" :
@@ -19743,6 +19827,18 @@
    "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" :
@@ -22619,7 +22715,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25407,6 +25503,21 @@
    "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" :
@@ -35290,13 +35401,18 @@
      "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" : 480,
+   "size" : 484,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -35980,7 +36096,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "standalone",
+     "field_name" : "flags",
      "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 ae873e6..95b97f0 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/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -131,12 +131,30 @@
    "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"
   },
   {
@@ -146,6 +164,15 @@
    "name" : "ABGRToUVRow_NEON"
   },
   {
+   "name" : "ABGRToYJRow_Any_NEON"
+  },
+  {
+   "name" : "ABGRToYJRow_C"
+  },
+  {
+   "name" : "ABGRToYJRow_NEON"
+  },
+  {
    "name" : "ABGRToYRow_Any_NEON"
   },
   {
@@ -545,6 +572,9 @@
    "name" : "ARGBToI420"
   },
   {
+   "name" : "ARGBToI420Alpha"
+  },
+  {
    "name" : "ARGBToI422"
   },
   {
@@ -851,6 +881,18 @@
    "name" : "DetilePlane"
   },
   {
+   "name" : "DetilePlane_16"
+  },
+  {
+   "name" : "DetileRow_16_Any_NEON"
+  },
+  {
+   "name" : "DetileRow_16_C"
+  },
+  {
+   "name" : "DetileRow_16_NEON"
+  },
+  {
    "name" : "DetileRow_Any_NEON"
   },
   {
@@ -872,6 +914,18 @@
    "name" : "DetileSplitUVRow_NEON"
   },
   {
+   "name" : "DetileToYUY2"
+  },
+  {
+   "name" : "DetileToYUY2_Any_NEON"
+  },
+  {
+   "name" : "DetileToYUY2_C"
+  },
+  {
+   "name" : "DetileToYUY2_NEON"
+  },
+  {
    "name" : "DivideRow_16_Any_NEON"
   },
   {
@@ -1016,6 +1070,9 @@
    "name" : "I010Copy"
   },
   {
+   "name" : "I010Rotate"
+  },
+  {
    "name" : "I010ToAB30"
   },
   {
@@ -1073,6 +1130,9 @@
    "name" : "I210Copy"
   },
   {
+   "name" : "I210Rotate"
+  },
+  {
    "name" : "I210ToAB30"
   },
   {
@@ -1124,6 +1184,9 @@
    "name" : "I212ToARGBRow_C"
   },
   {
+   "name" : "I212ToI420"
+  },
+  {
    "name" : "I212ToI422"
   },
   {
@@ -1166,6 +1229,12 @@
    "name" : "I410AlphaToARGBRow_C"
   },
   {
+   "name" : "I410Copy"
+  },
+  {
+   "name" : "I410Rotate"
+  },
+  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1181,9 +1250,15 @@
    "name" : "I410ToI010"
   },
   {
+   "name" : "I410ToI420"
+  },
+  {
    "name" : "I410ToI444"
   },
   {
+   "name" : "I412ToI420"
+  },
+  {
    "name" : "I412ToI444"
   },
   {
@@ -1292,6 +1367,9 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
+   "name" : "I420ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1406,6 +1484,18 @@
    "name" : "I422ToNV21"
   },
   {
+   "name" : "I422ToRAW"
+  },
+  {
+   "name" : "I422ToRGB24"
+  },
+  {
+   "name" : "I422ToRGB24Matrix"
+  },
+  {
+   "name" : "I422ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I422ToRGB24Row_Any_NEON"
   },
   {
@@ -1418,6 +1508,9 @@
    "name" : "I422ToRGB565"
   },
   {
+   "name" : "I422ToRGB565Matrix"
+  },
+  {
    "name" : "I422ToRGB565Row_Any_NEON"
   },
   {
@@ -1526,6 +1619,24 @@
    "name" : "I444ToNV21"
   },
   {
+   "name" : "I444ToRAW"
+  },
+  {
+   "name" : "I444ToRGB24"
+  },
+  {
+   "name" : "I444ToRGB24Matrix"
+  },
+  {
+   "name" : "I444ToRGB24Row_Any_NEON"
+  },
+  {
+   "name" : "I444ToRGB24Row_C"
+  },
+  {
+   "name" : "I444ToRGB24Row_NEON"
+  },
+  {
    "name" : "InitCpuFlags"
   },
   {
@@ -1616,6 +1727,12 @@
    "name" : "MM21ToNV12"
   },
   {
+   "name" : "MM21ToYUY2"
+  },
+  {
+   "name" : "MT2TToP010"
+  },
+  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -1646,12 +1763,6 @@
    "name" : "MergeARGBPlane"
   },
   {
-   "name" : "MergeARGBPlaneAlpha"
-  },
-  {
-   "name" : "MergeARGBPlaneOpaque"
-  },
-  {
    "name" : "MergeARGBRow_Any_NEON"
   },
   {
@@ -1745,6 +1856,9 @@
    "name" : "MirrorPlane"
   },
   {
+   "name" : "MirrorRow_16_C"
+  },
+  {
    "name" : "MirrorRow_Any_NEON"
   },
   {
@@ -1922,9 +2036,15 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
+   "name" : "P010ToI010"
+  },
+  {
    "name" : "P010ToP410"
   },
   {
+   "name" : "P012ToI012"
+  },
+  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2195,6 +2315,9 @@
    "name" : "RGBToYMatrixRow_NEON"
   },
   {
+   "name" : "RiscvCpuCaps"
+  },
+  {
    "name" : "RotatePlane"
   },
   {
@@ -2207,6 +2330,9 @@
    "name" : "RotatePlane90"
   },
   {
+   "name" : "RotatePlane_16"
+  },
+  {
    "name" : "Scale"
   },
   {
@@ -2348,6 +2474,9 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
+   "name" : "ScalePlaneDown2_16To8"
+  },
+  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -2381,6 +2510,12 @@
    "name" : "ScalePlane_16"
   },
   {
+   "name" : "ScaleRowDown2Box_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Box_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -2399,6 +2534,12 @@
    "name" : "ScaleRowDown2Box_Odd_NEON"
   },
   {
+   "name" : "ScaleRowDown2Linear_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -2411,6 +2552,12 @@
    "name" : "ScaleRowDown2Linear_NEON"
   },
   {
+   "name" : "ScaleRowDown2_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -2627,12 +2774,24 @@
    "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"
   },
   {
@@ -2747,12 +2906,6 @@
    "name" : "SplitARGBPlane"
   },
   {
-   "name" : "SplitARGBPlaneAlpha"
-  },
-  {
-   "name" : "SplitARGBPlaneOpaque"
-  },
-  {
    "name" : "SplitARGBRow_Any_NEON"
   },
   {
@@ -2843,9 +2996,21 @@
    "name" : "SwapUVRow_NEON"
   },
   {
+   "name" : "Transpose4x4_32_C"
+  },
+  {
+   "name" : "Transpose4x4_32_NEON"
+  },
+  {
    "name" : "TransposePlane"
   },
   {
+   "name" : "TransposePlane_16"
+  },
+  {
+   "name" : "TransposeUVWx8_16_C"
+  },
+  {
    "name" : "TransposeUVWx8_Any_NEON"
   },
   {
@@ -2858,6 +3023,9 @@
    "name" : "TransposeUVWxH_C"
   },
   {
+   "name" : "TransposeWx8_16_C"
+  },
+  {
    "name" : "TransposeWx8_Any_NEON"
   },
   {
@@ -2867,6 +3035,9 @@
    "name" : "TransposeWx8_NEON"
   },
   {
+   "name" : "TransposeWxH_16_C"
+  },
+  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -2969,6 +3140,12 @@
    "name" : "UYVYToYRow_NEON"
   },
   {
+   "name" : "UnpackMT2T_C"
+  },
+  {
+   "name" : "UnpackMT2T_NEON"
+  },
+  {
    "name" : "ValidateJpeg"
   },
   {
@@ -2996,6 +3173,15 @@
    "name" : "YUY2ToNV12"
   },
   {
+   "name" : "YUY2ToNVUVRow_Any_NEON"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_C"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_NEON"
+  },
+  {
    "name" : "YUY2ToUV422Row_Any_NEON"
   },
   {
@@ -3219,7 +3405,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3260,7 +3446,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3293,7 +3479,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3606,7 +3792,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -3855,7 +4041,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -3883,7 +4069,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -3907,7 +4093,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -3937,7 +4123,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_NEON",
@@ -3955,7 +4141,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -3973,7 +4159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_NEON",
@@ -3991,7 +4177,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4018,7 +4204,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -4036,7 +4222,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -4063,7 +4249,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -4102,7 +4288,112 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -4135,7 +4426,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -4168,7 +4459,79 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_NEON",
@@ -4192,7 +4555,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -4216,7 +4579,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_NEON",
@@ -4240,7 +4603,61 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_NEON",
@@ -4258,7 +4675,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -4276,7 +4693,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_NEON",
@@ -4294,7 +4711,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -4321,7 +4738,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -4339,7 +4756,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -4366,7 +4783,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -4384,7 +4801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -4411,7 +4828,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -4429,7 +4846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -4459,7 +4876,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -4480,7 +4897,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -4507,7 +4924,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -4534,7 +4951,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_NEON",
@@ -4552,7 +4969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -4570,7 +4987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_NEON",
@@ -4588,7 +5005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -4615,7 +5032,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_NEON",
@@ -4633,7 +5050,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -4651,7 +5068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_NEON",
@@ -4669,7 +5086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -4708,7 +5125,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_Any_NEON",
@@ -4732,7 +5149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -4756,7 +5173,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_NEON",
@@ -4780,7 +5197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_Any_NEON",
@@ -4798,7 +5215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -4816,7 +5233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_NEON",
@@ -4834,7 +5251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -4861,7 +5278,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_NEON",
@@ -4879,7 +5296,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -4897,7 +5314,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_NEON",
@@ -4915,7 +5332,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -4954,7 +5371,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_Any_NEON",
@@ -4978,7 +5395,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -5002,7 +5419,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_NEON",
@@ -5026,7 +5443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_Any_NEON",
@@ -5044,7 +5461,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -5062,7 +5479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_NEON",
@@ -5080,7 +5497,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -5113,7 +5530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_NEON",
@@ -5134,7 +5551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -5155,7 +5572,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_NEON",
@@ -5176,7 +5593,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -5200,7 +5617,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -5227,7 +5644,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_NEON",
@@ -5245,7 +5662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -5263,7 +5680,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_NEON",
@@ -5281,7 +5698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -5314,7 +5731,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -5335,7 +5752,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_NEON",
@@ -5356,7 +5773,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -5392,7 +5809,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -5422,7 +5839,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -5443,7 +5860,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_NEON",
@@ -5464,7 +5881,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -5494,7 +5911,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -5512,7 +5929,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -5539,7 +5956,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -5566,7 +5983,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -5593,7 +6010,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -5611,7 +6028,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -5638,7 +6055,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -5656,7 +6073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -5677,7 +6094,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -5704,7 +6121,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_NEON",
@@ -5722,7 +6139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -5740,7 +6157,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_NEON",
@@ -5758,7 +6175,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -5785,7 +6202,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -5803,7 +6220,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_NEON",
@@ -5821,7 +6238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -5848,7 +6265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -5884,7 +6301,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -5914,7 +6331,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -5938,7 +6355,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -5965,7 +6382,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_NEON",
@@ -5983,7 +6400,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -6001,7 +6418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_NEON",
@@ -6019,7 +6436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -6052,7 +6469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_NEON",
@@ -6073,7 +6490,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -6094,7 +6511,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_NEON",
@@ -6115,7 +6532,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -6145,7 +6562,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -6166,7 +6583,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -6202,7 +6619,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -6226,7 +6643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_NEON",
@@ -6250,7 +6667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -6280,7 +6697,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -6307,7 +6754,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -6322,7 +6769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_NEON",
@@ -6337,7 +6784,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_Any_NEON",
@@ -6355,7 +6802,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -6373,7 +6820,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_NEON",
@@ -6391,7 +6838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -6421,7 +6868,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -6442,7 +6889,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_NEON",
@@ -6463,7 +6910,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -6493,7 +6940,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_NEON",
@@ -6514,7 +6961,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -6535,7 +6982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_NEON",
@@ -6556,7 +7003,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -6583,7 +7030,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -6610,7 +7057,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -6637,7 +7084,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -6670,7 +7117,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_NEON",
@@ -6691,7 +7138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -6712,7 +7159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_NEON",
@@ -6733,7 +7180,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -6760,7 +7207,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_NEON",
@@ -6778,7 +7225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -6796,7 +7243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_NEON",
@@ -6814,7 +7261,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -6841,7 +7315,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -6859,7 +7333,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -6886,7 +7360,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_NEON",
@@ -6904,7 +7378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -6922,7 +7396,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_NEON",
@@ -6940,7 +7414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -6967,7 +7441,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_NEON",
@@ -6985,7 +7459,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -7003,7 +7477,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_NEON",
@@ -7021,7 +7495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -7048,7 +7522,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_NEON",
@@ -7066,7 +7540,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -7084,7 +7558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_NEON",
@@ -7102,7 +7576,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -7129,7 +7630,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -7168,7 +7669,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -7207,7 +7753,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -7246,7 +7792,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -7273,7 +7819,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -7312,7 +7858,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -7351,7 +7897,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -7384,7 +7930,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -7417,7 +7963,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -7444,7 +7990,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_NEON",
@@ -7462,7 +8008,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -7480,7 +8026,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_NEON",
@@ -7498,7 +8044,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -7525,7 +8071,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_NEON",
@@ -7543,7 +8089,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -7561,7 +8107,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_NEON",
@@ -7579,7 +8125,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -7606,7 +8152,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -7636,7 +8182,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_NEON",
@@ -7657,7 +8203,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -7671,14 +8217,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_NEON",
@@ -7692,14 +8238,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_NEON",
@@ -7717,7 +8263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -7735,7 +8281,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_NEON",
@@ -7753,7 +8299,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -7780,7 +8326,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_NEON",
@@ -7801,7 +8347,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -7822,7 +8368,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_NEON",
@@ -7843,7 +8389,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_NEON",
@@ -7867,7 +8413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -7891,7 +8437,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_NEON",
@@ -7915,7 +8461,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_NEON",
@@ -7939,7 +8485,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -7963,7 +8509,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_NEON",
@@ -7987,7 +8533,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -8014,7 +8560,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_NEON",
@@ -8032,7 +8578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -8050,7 +8596,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_NEON",
@@ -8068,7 +8614,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_NEON",
@@ -8086,7 +8632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -8104,7 +8650,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_NEON",
@@ -8122,7 +8668,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -8149,7 +8695,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -8176,7 +8722,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -8194,7 +8740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -8227,7 +8773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -8260,7 +8806,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_Any_NEON",
@@ -8281,7 +8827,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -8302,7 +8848,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_NEON",
@@ -8323,7 +8869,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_Any_NEON",
@@ -8344,7 +8890,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -8365,7 +8911,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_NEON",
@@ -8386,7 +8932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_Any_NEON",
@@ -8404,7 +8950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -8422,7 +8968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_NEON",
@@ -8440,7 +8986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -8482,7 +9028,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -8524,7 +9070,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -8569,7 +9115,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -8623,7 +9169,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -8680,7 +9226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -8692,7 +9238,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -8719,7 +9265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -8758,7 +9304,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_NEON",
@@ -8782,7 +9328,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -8806,7 +9352,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_NEON",
@@ -8830,7 +9376,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_NEON",
@@ -8848,7 +9394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -8866,7 +9412,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_NEON",
@@ -8884,7 +9430,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -8923,7 +9469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -8947,7 +9493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -8968,7 +9514,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_Any_NEON",
@@ -8989,7 +9535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -9010,7 +9556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_NEON",
@@ -9031,7 +9577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -9058,7 +9604,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -9085,7 +9631,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -9097,7 +9643,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
+   "source_file" : "external/libyuv/include/libyuv/video_common.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -9118,7 +9664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -9136,7 +9682,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -9154,7 +9700,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -9181,7 +9727,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -9211,7 +9757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_NEON",
@@ -9232,7 +9778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -9253,7 +9799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_NEON",
@@ -9274,7 +9820,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -9304,7 +9850,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -9325,7 +9871,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -9367,7 +9913,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -9412,7 +9958,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -9469,7 +10015,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -9499,7 +10045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -9529,7 +10075,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -9556,7 +10102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -9583,7 +10129,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -9601,7 +10147,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_NEON",
@@ -9619,7 +10165,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -9637,7 +10183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_NEON",
@@ -9655,7 +10201,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -9673,7 +10219,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -9700,7 +10246,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -9729,8 +10275,101 @@
      "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/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::DetileRow_Any_NEON",
@@ -9751,7 +10390,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -9772,7 +10411,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_NEON",
@@ -9793,7 +10432,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -9829,7 +10468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_NEON",
@@ -9853,7 +10492,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -9877,7 +10516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_NEON",
@@ -9901,7 +10540,124 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_NEON",
@@ -9922,7 +10678,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -9943,7 +10699,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_NEON",
@@ -9964,7 +10720,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -9979,7 +10735,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -9994,7 +10750,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -10024,7 +10810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -10051,7 +10837,25 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -10069,13 +10873,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -10114,7 +10918,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -10153,7 +10957,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -10192,7 +10996,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -10231,7 +11035,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -10270,7 +11074,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -10309,7 +11113,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -10348,7 +11152,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -10387,7 +11191,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -10426,7 +11230,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -10465,7 +11269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -10504,7 +11308,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -10543,7 +11347,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -10582,7 +11386,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -10621,7 +11425,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -10660,7 +11464,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -10699,7 +11503,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -10738,7 +11542,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -10777,7 +11581,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -10816,7 +11620,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_Any_NEON",
@@ -10837,7 +11641,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_NEON",
@@ -10858,7 +11662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -10888,7 +11692,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_NEON",
@@ -10909,7 +11713,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -10930,7 +11734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_NEON",
@@ -10951,7 +11755,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -10984,7 +11788,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -11011,7 +11815,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_NEON",
@@ -11038,7 +11842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -11056,7 +11860,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_NEON",
@@ -11074,7 +11878,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -11092,7 +11896,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -11110,7 +11914,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -11161,7 +11965,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -11215,7 +12019,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -11266,7 +12070,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -11305,7 +12163,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -11344,7 +12202,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -11383,7 +12241,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -11425,7 +12283,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -11470,7 +12328,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -11509,7 +12367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -11551,7 +12409,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -11596,7 +12454,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -11647,7 +12505,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -11698,7 +12556,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -11743,7 +12601,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -11785,7 +12643,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -11827,7 +12685,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -11878,7 +12736,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -11923,7 +12781,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -11974,7 +12832,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -12028,7 +12886,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -12058,7 +12916,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -12109,7 +12967,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -12148,7 +13060,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -12187,7 +13099,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -12226,7 +13138,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -12268,7 +13180,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -12313,7 +13225,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -12340,7 +13252,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -12379,7 +13291,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -12421,7 +13333,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -12466,7 +13378,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -12493,7 +13405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -12544,7 +13456,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -12595,7 +13507,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -12646,7 +13558,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -12697,7 +13609,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -12742,7 +13654,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -12769,7 +13681,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -12796,7 +13708,58 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -12847,7 +13810,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -12892,7 +13855,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -12919,7 +13882,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -12946,7 +13909,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -12973,7 +13936,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -13003,7 +13966,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_NEON",
@@ -13024,7 +13987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -13045,7 +14008,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_NEON",
@@ -13066,7 +14029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -13093,7 +14056,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -13132,7 +14095,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -13165,7 +14128,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -13216,7 +14179,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -13246,7 +14209,112 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -13288,7 +14356,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -13315,7 +14383,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -13357,7 +14425,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -13384,7 +14452,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -13435,7 +14503,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -13486,7 +14605,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -13537,7 +14707,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -13585,7 +14755,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -13633,7 +14803,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -13684,7 +14854,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -13738,7 +14908,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -13813,7 +14983,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -13864,7 +15034,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -13936,7 +15106,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -13987,7 +15157,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -14038,7 +15208,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -14086,7 +15256,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -14140,7 +15310,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -14200,7 +15370,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -14260,7 +15430,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -14320,7 +15490,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -14371,7 +15541,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -14410,7 +15580,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -14449,7 +15619,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -14488,7 +15658,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -14530,7 +15700,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -14569,7 +15739,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -14608,7 +15778,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -14647,7 +15817,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -14689,7 +15859,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -14734,7 +15904,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -14773,7 +15943,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -14824,7 +15994,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -14875,7 +16045,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -14914,7 +16084,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -14965,7 +16135,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -15016,7 +16186,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -15061,7 +16231,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -15106,7 +16276,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -15145,7 +16315,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -15184,7 +16354,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -15226,7 +16396,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -15265,7 +16480,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -15307,7 +16522,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -15349,7 +16564,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -15388,7 +16603,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -15430,7 +16645,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -15469,7 +16684,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -15508,7 +16723,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -15556,7 +16771,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -15604,7 +16819,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -15655,7 +16870,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -15709,7 +16924,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_NEON",
@@ -15739,7 +16954,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -15769,7 +16984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_NEON",
@@ -15799,7 +17014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -15850,7 +17065,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -15904,7 +17119,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -15964,7 +17179,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -16024,7 +17239,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -16084,7 +17299,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -16123,7 +17338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -16150,7 +17365,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -16189,7 +17404,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_NEON",
@@ -16216,7 +17431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -16243,7 +17458,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_NEON",
@@ -16270,7 +17485,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_NEON",
@@ -16297,7 +17512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -16324,7 +17539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_NEON",
@@ -16351,7 +17566,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -16393,7 +17608,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -16438,7 +17653,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_NEON",
@@ -16465,7 +17680,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -16492,7 +17707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_NEON",
@@ -16519,7 +17734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -16558,7 +17773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -16609,7 +17824,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -16660,7 +17875,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -16711,7 +17926,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -16756,7 +17971,172 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_NEON",
@@ -16783,7 +18163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -16810,7 +18190,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_NEON",
@@ -16837,7 +18217,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -16876,7 +18256,49 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_NEON",
@@ -16903,7 +18325,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -16930,7 +18352,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_NEON",
@@ -16957,7 +18379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -16996,7 +18418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -17038,7 +18460,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_NEON",
@@ -17065,7 +18487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -17092,7 +18514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_NEON",
@@ -17119,7 +18541,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -17158,7 +18580,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_NEON",
@@ -17182,7 +18604,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -17206,7 +18628,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_NEON",
@@ -17230,7 +18652,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -17269,7 +18691,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_NEON",
@@ -17293,7 +18715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -17317,7 +18739,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_NEON",
@@ -17341,7 +18763,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -17389,7 +18811,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -17437,7 +18859,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -17488,7 +18910,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_NEON",
@@ -17518,7 +18940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -17548,7 +18970,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_NEON",
@@ -17578,7 +19000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -17629,7 +19051,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -17683,7 +19105,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -17743,7 +19165,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -17803,7 +19225,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -17863,7 +19285,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -17902,7 +19324,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -17941,7 +19363,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -17983,7 +19405,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_NEON",
@@ -18010,7 +19432,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -18037,7 +19459,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_NEON",
@@ -18064,7 +19486,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -18115,7 +19537,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -18160,7 +19582,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -18205,13 +19627,214 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -18247,7 +19870,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -18283,7 +19906,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -18310,7 +19933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_Any_NEON",
@@ -18334,7 +19957,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -18358,7 +19981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_NEON",
@@ -18382,7 +20005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_NEON",
@@ -18406,7 +20029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -18430,7 +20053,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_NEON",
@@ -18454,7 +20077,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -18481,7 +20104,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_NEON",
@@ -18499,7 +20122,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -18517,7 +20140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_NEON",
@@ -18535,7 +20158,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -18574,7 +20197,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -18613,7 +20236,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -18652,7 +20275,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -18691,7 +20314,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -18730,7 +20353,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -18769,7 +20392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -18808,7 +20431,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -18847,7 +20470,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -18886,7 +20509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -18907,7 +20530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -18940,7 +20563,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -18985,7 +20608,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -19024,7 +20647,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -19063,7 +20686,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -19108,7 +20731,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -19147,7 +20770,79 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -19159,7 +20854,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -19207,7 +20902,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_NEON",
@@ -19237,7 +20932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -19267,7 +20962,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_NEON",
@@ -19297,7 +20992,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -19345,7 +21040,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_NEON",
@@ -19375,7 +21070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -19405,7 +21100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_NEON",
@@ -19435,7 +21130,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -19480,7 +21175,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_NEON",
@@ -19507,7 +21202,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -19534,7 +21229,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_NEON",
@@ -19561,7 +21256,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -19600,7 +21295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -19624,7 +21319,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_NEON",
@@ -19648,7 +21343,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -19681,7 +21376,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -19717,7 +21412,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_NEON",
@@ -19741,7 +21436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -19765,7 +21460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_NEON",
@@ -19789,7 +21484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_NEON",
@@ -19810,7 +21505,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -19831,7 +21526,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_NEON",
@@ -19852,7 +21547,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -19894,7 +21589,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_Any_NEON",
@@ -19921,7 +21616,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_NEON",
@@ -19948,7 +21643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_NEON",
@@ -19975,7 +21670,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -20002,7 +21697,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_NEON",
@@ -20029,7 +21724,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_NEON",
@@ -20056,7 +21751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -20083,7 +21778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_NEON",
@@ -20110,7 +21805,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_NEON",
@@ -20137,7 +21832,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -20164,7 +21859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_NEON",
@@ -20191,7 +21886,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_NEON",
@@ -20215,7 +21910,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -20239,7 +21934,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_NEON",
@@ -20263,7 +21958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -20275,7 +21970,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -20302,7 +21997,25 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_NEON",
@@ -20320,7 +22033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -20338,7 +22051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_NEON",
@@ -20356,7 +22069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -20377,7 +22090,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_NEON",
@@ -20398,7 +22111,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -20425,7 +22138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_NEON",
@@ -20443,7 +22156,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -20461,7 +22174,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_NEON",
@@ -20479,7 +22192,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_NEON",
@@ -20500,7 +22213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -20521,7 +22234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_NEON",
@@ -20542,7 +22255,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -20581,7 +22294,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -20620,7 +22333,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -20668,7 +22381,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -20701,7 +22414,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -20734,7 +22447,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -20770,7 +22483,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_NEON",
@@ -20794,7 +22507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -20818,7 +22531,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_NEON",
@@ -20842,7 +22555,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -20887,7 +22600,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -20935,7 +22648,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -20974,7 +22687,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -21007,7 +22720,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -21040,7 +22753,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -21076,7 +22789,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_NEON",
@@ -21100,7 +22813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -21124,7 +22837,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_NEON",
@@ -21148,7 +22861,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -21181,7 +22894,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -21217,7 +22930,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_NEON",
@@ -21241,7 +22954,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -21265,7 +22978,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_NEON",
@@ -21289,7 +23002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -21328,7 +23041,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -21367,7 +23080,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -21400,7 +23113,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -21433,7 +23146,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -21469,7 +23182,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_NEON",
@@ -21493,7 +23206,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -21517,7 +23230,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_NEON",
@@ -21541,7 +23254,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -21586,7 +23299,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -21625,7 +23338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -21658,7 +23371,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -21691,7 +23404,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -21727,7 +23440,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_NEON",
@@ -21751,7 +23464,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -21775,7 +23488,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_NEON",
@@ -21799,7 +23512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -21832,7 +23545,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_NEON",
@@ -21853,7 +23566,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -21874,7 +23587,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_NEON",
@@ -21895,7 +23608,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -21931,7 +23644,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -21970,7 +23683,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -22006,7 +23719,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -22045,7 +23758,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -22084,7 +23842,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -22120,7 +23923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -22159,7 +23962,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -22183,7 +23986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -22219,7 +24022,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -22258,7 +24061,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -22282,7 +24085,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -22321,7 +24124,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -22345,7 +24148,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -22369,7 +24172,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -22396,7 +24199,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_NEON",
@@ -22414,7 +24217,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -22432,7 +24235,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_NEON",
@@ -22450,7 +24253,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -22489,7 +24292,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -22516,7 +24319,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -22555,7 +24358,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -22588,7 +24391,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -22615,7 +24418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_NEON",
@@ -22633,7 +24436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -22651,7 +24454,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_NEON",
@@ -22669,7 +24472,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -22696,7 +24499,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_NEON",
@@ -22714,7 +24517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -22732,7 +24535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_NEON",
@@ -22750,7 +24553,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_Any_NEON",
@@ -22774,7 +24577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -22798,7 +24601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_NEON",
@@ -22822,7 +24625,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_Any_NEON",
@@ -22846,7 +24649,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -22870,7 +24673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_NEON",
@@ -22894,7 +24697,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_NEON",
@@ -22912,7 +24715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -22930,7 +24733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_NEON",
@@ -22948,7 +24751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_Any_NEON",
@@ -22966,7 +24769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -22984,7 +24787,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_NEON",
@@ -23002,7 +24805,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -23029,7 +24832,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_NEON",
@@ -23047,7 +24850,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -23065,7 +24868,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_NEON",
@@ -23083,7 +24886,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -23110,7 +24913,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_NEON",
@@ -23128,7 +24931,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -23146,7 +24949,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_NEON",
@@ -23164,7 +24967,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -23203,7 +25006,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -23230,7 +25033,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -23269,7 +25072,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_Any_NEON",
@@ -23293,7 +25096,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -23317,7 +25120,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_NEON",
@@ -23341,7 +25144,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_Any_NEON",
@@ -23365,7 +25168,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -23389,7 +25192,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_NEON",
@@ -23413,7 +25216,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_NEON",
@@ -23431,7 +25234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -23449,7 +25252,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_NEON",
@@ -23467,7 +25270,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_Any_NEON",
@@ -23485,7 +25288,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -23503,7 +25306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_NEON",
@@ -23521,7 +25324,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -23548,7 +25351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_NEON",
@@ -23566,7 +25369,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -23584,7 +25387,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_NEON",
@@ -23602,7 +25405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -23641,7 +25444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_Any_NEON",
@@ -23665,7 +25468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -23689,7 +25492,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_NEON",
@@ -23713,7 +25516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_Any_NEON",
@@ -23731,7 +25534,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -23749,7 +25552,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_NEON",
@@ -23767,7 +25570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -23794,7 +25597,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -23833,7 +25636,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -23860,7 +25663,31 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_NEON",
@@ -23884,7 +25711,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -23908,7 +25735,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_NEON",
@@ -23932,7 +25759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_NEON",
@@ -23950,7 +25777,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -23968,7 +25795,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_NEON",
@@ -23986,7 +25813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_NEON",
@@ -24004,7 +25831,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -24022,7 +25849,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_NEON",
@@ -24040,7 +25867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -24070,7 +25897,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -24100,7 +25927,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -24118,7 +25945,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -24154,7 +25981,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -24184,7 +26023,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -24211,7 +26050,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -24238,7 +26077,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -24265,7 +26104,37 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "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"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -24325,7 +26194,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -24349,7 +26218,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -24373,7 +26242,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_Any_NEON",
@@ -24397,7 +26266,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -24421,7 +26290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -24445,7 +26314,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_Any_NEON",
@@ -24469,7 +26338,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -24493,7 +26362,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_NEON",
@@ -24514,7 +26383,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -24535,7 +26404,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_NEON",
@@ -24556,7 +26425,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -24577,7 +26446,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_NEON",
@@ -24598,7 +26467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -24619,7 +26488,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_NEON",
@@ -24643,7 +26512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -24667,7 +26536,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_NEON",
@@ -24691,7 +26560,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -24715,7 +26584,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -24733,7 +26602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_NEON",
@@ -24751,7 +26620,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -24769,7 +26638,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -24793,7 +26662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -24817,7 +26686,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -24841,7 +26710,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -24865,7 +26734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -24889,7 +26758,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -24913,7 +26782,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -24937,7 +26806,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_Any_NEON",
@@ -24961,7 +26830,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -24985,7 +26854,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -25009,7 +26878,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -25030,7 +26899,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -25066,7 +26935,46 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -25111,7 +27019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -25156,7 +27064,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -25204,7 +27112,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -25240,7 +27148,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -25276,7 +27184,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -25297,7 +27253,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_NEON",
@@ -25318,7 +27274,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -25339,7 +27295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -25360,7 +27316,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_NEON",
@@ -25381,7 +27337,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -25402,7 +27406,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_NEON",
@@ -25423,7 +27427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -25444,7 +27448,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -25465,7 +27517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_NEON",
@@ -25486,7 +27538,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -25507,7 +27559,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -25528,7 +27580,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_NEON",
@@ -25549,7 +27601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -25570,7 +27622,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -25591,7 +27643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -25612,7 +27664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_NEON",
@@ -25633,7 +27685,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -25654,7 +27706,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_NEON",
@@ -25675,7 +27727,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -25696,7 +27748,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -25717,7 +27769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -25738,7 +27790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_NEON",
@@ -25759,7 +27811,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -25780,7 +27832,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -25801,7 +27853,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_NEON",
@@ -25822,7 +27874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -25843,7 +27895,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_NEON",
@@ -25864,7 +27916,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -25885,7 +27937,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -25906,7 +27958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_NEON",
@@ -25927,7 +27979,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -25948,7 +28000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -25969,7 +28021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_NEON",
@@ -25990,7 +28042,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -26011,7 +28063,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_NEON",
@@ -26035,7 +28087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -26059,7 +28111,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_NEON",
@@ -26083,7 +28135,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -26107,7 +28159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -26131,7 +28183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_NEON",
@@ -26155,7 +28207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -26179,7 +28231,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_NEON",
@@ -26197,7 +28249,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -26215,7 +28267,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_NEON",
@@ -26233,7 +28285,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -26251,7 +28303,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -26269,7 +28321,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_NEON",
@@ -26287,7 +28339,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -26305,7 +28357,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -26326,7 +28378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -26362,7 +28414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -26383,7 +28435,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -26407,7 +28459,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -26431,7 +28483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -26455,7 +28507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -26479,7 +28531,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -26503,7 +28555,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_NEON",
@@ -26524,7 +28576,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -26545,7 +28597,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -26566,7 +28639,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -26587,7 +28681,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -26611,7 +28705,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_Any_NEON",
@@ -26635,7 +28729,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -26659,7 +28753,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -26683,7 +28777,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_NEON",
@@ -26707,7 +28801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -26731,7 +28825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -26755,7 +28849,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_NEON",
@@ -26779,7 +28873,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -26803,7 +28897,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -26821,7 +28915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_NEON",
@@ -26839,7 +28933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -26857,7 +28951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -26875,7 +28969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_NEON",
@@ -26893,7 +28987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -26911,7 +29005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -26935,7 +29029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_NEON",
@@ -26953,7 +29047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -26971,7 +29065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_NEON",
@@ -26989,7 +29083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_NEON",
@@ -27010,7 +29104,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -27031,7 +29125,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_NEON",
@@ -27052,7 +29146,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_NEON",
@@ -27073,7 +29167,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -27094,7 +29188,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_NEON",
@@ -27115,7 +29209,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -27139,7 +29233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_NEON",
@@ -27163,7 +29257,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_NEON",
@@ -27184,7 +29278,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -27205,7 +29299,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_NEON",
@@ -27226,7 +29320,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -27247,7 +29341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_NEON",
@@ -27268,7 +29362,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -27313,7 +29407,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_NEON",
@@ -27340,7 +29434,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -27367,7 +29461,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_NEON",
@@ -27394,7 +29488,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -27433,7 +29527,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_NEON",
@@ -27457,7 +29551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -27481,7 +29575,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_NEON",
@@ -27505,7 +29599,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -27541,7 +29635,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -27574,7 +29668,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -27607,7 +29701,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -27640,7 +29734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -27673,7 +29767,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -27706,7 +29800,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -27742,7 +29836,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_NEON",
@@ -27766,7 +29860,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -27790,7 +29884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_NEON",
@@ -27814,7 +29908,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_NEON",
@@ -27835,7 +29929,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -27856,7 +29950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_NEON",
@@ -27877,7 +29971,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_NEON",
@@ -27901,7 +29995,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -27925,7 +30019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_NEON",
@@ -27949,7 +30043,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -27964,7 +30058,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -27982,7 +30076,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_NEON",
@@ -28000,7 +30094,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -28027,7 +30121,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_NEON",
@@ -28045,7 +30139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -28063,7 +30157,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_NEON",
@@ -28081,7 +30175,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposePlane",
@@ -28108,7 +30250,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_Any_NEON",
@@ -28138,7 +30280,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -28168,7 +30310,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_NEON",
@@ -28198,7 +30340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -28231,7 +30373,31 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_NEON",
@@ -28255,7 +30421,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -28279,7 +30445,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_NEON",
@@ -28303,7 +30469,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -28330,7 +30523,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -28369,7 +30562,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -28408,7 +30601,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -28447,7 +30640,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -28486,7 +30679,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -28525,7 +30718,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -28564,7 +30757,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -28603,7 +30796,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -28642,7 +30835,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -28681,7 +30874,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -28720,7 +30913,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -28759,7 +30952,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -28798,7 +30991,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -28837,7 +31030,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -28876,7 +31069,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -28903,7 +31096,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_NEON",
@@ -28924,7 +31117,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -28945,7 +31138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_NEON",
@@ -28966,7 +31159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -29005,7 +31198,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -29044,7 +31237,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -29077,7 +31270,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_NEON",
@@ -29098,7 +31291,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -29119,7 +31312,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_NEON",
@@ -29140,7 +31333,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_NEON",
@@ -29164,7 +31357,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -29188,7 +31381,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_NEON",
@@ -29212,7 +31405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -29239,7 +31432,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_NEON",
@@ -29257,7 +31450,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -29275,7 +31468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_NEON",
@@ -29293,7 +31486,43 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ValidateJpeg",
@@ -29308,7 +31537,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -29335,7 +31564,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_NEON",
@@ -29356,7 +31585,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -29377,7 +31606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_NEON",
@@ -29398,7 +31627,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -29437,7 +31666,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -29476,7 +31705,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -29509,7 +31738,70 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_NEON",
@@ -29530,7 +31822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -29551,7 +31843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_NEON",
@@ -29572,7 +31864,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_NEON",
@@ -29596,7 +31888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -29620,7 +31912,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_NEON",
@@ -29644,7 +31936,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -29671,7 +31963,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_NEON",
@@ -29689,7 +31981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -29707,7 +31999,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_NEON",
@@ -29725,7 +32017,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -29739,7 +32031,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -29752,7 +32044,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -29766,7 +32058,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -29779,7 +32071,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -29801,7 +32093,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -29826,7 +32118,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -29842,7 +32134,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -29855,7 +32147,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -29871,7 +32163,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -29887,7 +32179,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -29904,7 +32196,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -29920,7 +32212,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -29936,7 +32228,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -29952,7 +32244,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -29969,7 +32261,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -29983,7 +32275,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -29999,7 +32291,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -30015,7 +32307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -30033,7 +32325,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -30046,7 +32338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -30062,7 +32354,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -30075,7 +32367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -30088,7 +32380,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -30107,7 +32399,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -30120,7 +32412,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -30133,7 +32425,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -30146,7 +32438,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -30159,7 +32451,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -30168,121 +32460,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -30295,7 +32587,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30304,7 +32596,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30313,7 +32605,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -30322,7 +32614,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30331,7 +32623,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -30340,7 +32632,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30349,7 +32641,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -30358,7 +32650,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -30367,7 +32659,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -30376,7 +32668,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -30385,7 +32677,16 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "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"
   },
   {
    "alignment" : 4,
@@ -30394,7 +32695,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -30403,7 +32704,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30412,7 +32713,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30421,7 +32722,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30430,7 +32731,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30439,7 +32740,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30448,7 +32749,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -30457,7 +32758,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -30466,7 +32767,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30475,7 +32776,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -30484,7 +32785,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -30493,7 +32794,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -30506,7 +32807,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 16,
@@ -30516,7 +32817,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -30526,7 +32827,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -30536,7 +32837,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -30546,7 +32847,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -30556,7 +32857,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -30566,7 +32867,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -30576,7 +32877,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -30586,7 +32887,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -30596,7 +32897,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -30625,7 +32926,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 12,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30703,7 +33004,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 56,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 16,
@@ -30724,7 +33025,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -30745,7 +33046,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/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 3b081d0..666ed2e 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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2937,7 +2937,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "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" : -16777216,
+     "enum_field_value" : 4278190080,
      "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" : -1073741824,
+     "enum_field_value" : 3221225472,
      "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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "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 bc9ee2b..36d7ff5 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" : 0,
+     "enum_field_value" : 4294967296,
      "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" : 0,
+     "enum_field_value" : -281474976710656,
      "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 f27866a..a032d46 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 39786c3..7439e7b 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 14039db..863b79f 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" : 0,
+     "enum_field_value" : 4294967296,
      "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" : 0,
+     "enum_field_value" : -281474976710656,
      "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 a293991..bb71c8b 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 f7f16b2..9a59783 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 dcd0559..1231648 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 115a7c4..e3cc57d 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 7a4a65f..9c2b5f4 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 02a8e59..b7861db 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 21c6d45..5596645 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 d1c967d..3a27cdb 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 c613f19..33bb237 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 85c033d..debd12d 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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3688,7 +3688,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "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" : -16777216,
+     "enum_field_value" : 4278190080,
      "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" : -1073741824,
+     "enum_field_value" : 3221225472,
      "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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "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 97c9ba5..c6697e5 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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -868,10 +868,35 @@
    "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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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" :
    [
@@ -3139,7 +3164,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3157,7 +3182,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3178,7 +3203,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3262,7 +3287,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3313,7 +3338,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -5043,7 +5068,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -5079,7 +5104,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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -5097,7 +5122,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -5115,7 +5140,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -5133,7 +5158,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -5187,7 +5212,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5196,7 +5221,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5205,7 +5230,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5250,7 +5275,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -5277,7 +5302,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -5304,7 +5329,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -6420,7 +6445,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -7969,7 +7994,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -8009,7 +8034,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -9691,7 +9716,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -9731,7 +9756,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -9929,7 +9954,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9979,7 +10004,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -9989,7 +10014,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -9999,7 +10024,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -10009,7 +10034,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -10231,6 +10256,32 @@
    "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" :
    [
@@ -10286,7 +10337,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -10316,7 +10367,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -10584,7 +10635,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10600,7 +10651,28 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "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"
   },
   {
    "alignment" : 8,
@@ -10648,7 +10720,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10690,7 +10762,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10721,7 +10793,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -10758,7 +10830,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10805,7 +10877,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -10831,7 +10903,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -10878,7 +10950,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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -11032,7 +11104,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -11053,7 +11125,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -11089,7 +11161,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -11241,7 +11313,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -11408,7 +11480,7 @@
    "referenced_type" : "_ZTI6dirent",
    "self_type" : "_ZTI6dirent",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 8,
@@ -11424,7 +11496,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -11445,7 +11517,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -11502,7 +11574,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -11523,7 +11595,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11610,7 +11682,7 @@
    "referenced_type" : "_ZTI8dirent64",
    "self_type" : "_ZTI8dirent64",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 1,
@@ -11692,7 +11764,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -11786,7 +11858,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -11847,7 +11919,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -11863,7 +11935,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -11884,7 +11956,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -11966,7 +12038,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -11987,7 +12059,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -12017,7 +12089,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -12337,7 +12409,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -15116,7 +15188,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -15138,7 +15210,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -16919,7 +16991,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -16928,7 +17000,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -16943,7 +17015,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -16952,7 +17024,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -16967,7 +17039,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -16976,7 +17048,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -16991,7 +17063,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -17000,7 +17072,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -38780,7 +38852,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -43750,7 +43822,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -43790,7 +43862,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -43800,7 +43872,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -43810,7 +43882,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -44745,7 +44817,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -44754,7 +44826,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -44846,7 +44918,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -44855,7 +44927,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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 f50f4bb..a5b8e25 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,6 +5965,12 @@
     },
     {
      "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/config.json b/34/64/arm64/source-based/config.json
index 403b4cf..5da2c2b 100644
--- a/34/64/arm64/source-based/config.json
+++ b/34/64/arm64/source-based/config.json
@@ -1,4 +1,9 @@
 {
+  "global": {
+    "flags": {
+      "advice_only": true
+    }
+  },
   "libbinder": [
     {
       "target_version": "current",
diff --git a/34/64/arm64/source-based/libRSCpuRef.so.lsdump b/34/64/arm64/source-based/libRSCpuRef.so.lsdump
index 22dae3f..23d7628 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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -313,7 +313,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -637,7 +637,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 56,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -655,7 +655,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/android/dlext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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" : -2097153,
+     "enum_field_value" : 4292870143,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "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/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6124,10 +6124,35 @@
    "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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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" :
    [
@@ -9229,7 +9254,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9247,7 +9272,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9286,7 +9311,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9670,7 +9695,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9688,7 +9713,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9721,7 +9746,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9736,7 +9761,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9754,7 +9779,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9772,7 +9797,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9799,7 +9824,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9835,7 +9860,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9853,7 +9878,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9874,7 +9899,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9898,7 +9923,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9934,7 +9959,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9973,7 +9998,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10009,7 +10034,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10048,7 +10073,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10081,7 +10106,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10099,7 +10124,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10216,7 +10241,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10237,7 +10262,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11599,7 +11624,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -11617,7 +11642,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11728,7 +11753,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -21865,7 +21890,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -21883,7 +21908,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -21892,7 +21917,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -21937,7 +21962,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -21955,7 +21980,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22027,7 +22052,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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -22036,7 +22061,7 @@
    "referenced_type" : "_ZTI19android_namespace_t",
    "self_type" : "_ZTIP19android_namespace_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 8,
@@ -22045,7 +22070,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22054,7 +22079,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22072,7 +22097,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -22090,7 +22115,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -22108,7 +22133,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -22216,7 +22241,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -22225,7 +22250,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -22243,7 +22268,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -22405,7 +22430,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22414,7 +22439,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22423,7 +22448,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22432,7 +22457,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22441,7 +22466,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22450,7 +22475,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22459,7 +22484,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22477,7 +22502,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22486,7 +22511,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22495,7 +22520,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22504,7 +22529,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22513,7 +22538,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22522,7 +22547,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22531,7 +22556,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22540,7 +22565,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22549,7 +22574,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22558,7 +22583,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22621,7 +22646,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22630,7 +22655,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -23098,7 +23123,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -23107,7 +23132,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23161,7 +23186,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -23188,7 +23213,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23233,7 +23258,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -23242,7 +23267,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -23269,7 +23294,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -23392,8 +23417,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -23842,8 +23867,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -26275,7 +26300,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -29911,7 +29936,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -29965,7 +29990,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -30226,7 +30251,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -30370,7 +30395,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -30451,7 +30476,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -30622,7 +30647,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -30690,7 +30715,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -30740,7 +30765,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -30750,7 +30775,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -30790,7 +30815,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -34463,7 +34488,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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 8,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -34506,7 +34531,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -34776,7 +34801,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -34806,7 +34831,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -35014,7 +35039,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35064,7 +35089,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35074,7 +35099,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35084,7 +35109,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35094,7 +35119,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35529,6 +35554,32 @@
    "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" :
    [
@@ -35659,7 +35710,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -35715,7 +35766,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 16,
@@ -35768,7 +35819,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -35798,7 +35849,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -36255,7 +36306,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 16,
@@ -36332,7 +36383,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36348,7 +36399,28 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "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"
   },
   {
    "alignment" : 8,
@@ -36483,7 +36555,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36627,7 +36699,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36643,7 +36715,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36674,7 +36746,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -36741,7 +36813,7 @@
    "referenced_type" : "_ZTI17android_dlextinfo",
    "self_type" : "_ZTI17android_dlextinfo",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 8,
@@ -36757,7 +36829,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36962,7 +37034,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -36988,7 +37060,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -37035,7 +37107,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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -37077,7 +37149,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -37214,7 +37286,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -37501,7 +37573,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -37597,7 +37669,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -37618,7 +37690,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -37654,7 +37726,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -37806,7 +37878,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -37953,7 +38025,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -37974,7 +38046,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -38203,7 +38275,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -38234,7 +38306,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 8,
@@ -38270,7 +38342,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -38291,7 +38363,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -38450,7 +38522,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -38565,7 +38637,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -38626,7 +38698,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -38642,7 +38714,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -38724,7 +38796,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -38745,7 +38817,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -38775,7 +38847,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -39095,7 +39167,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -45370,7 +45442,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_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",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -45451,7 +45523,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_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",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -46226,7 +46298,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "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"
     },
     {
      "field_name" : "second",
@@ -46243,7 +46315,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_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",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -46253,7 +46325,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "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"
     },
     {
      "field_name" : "second",
@@ -46270,7 +46342,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_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",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -49834,7 +49906,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -49856,7 +49928,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -55424,7 +55496,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -55433,7 +55505,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55448,7 +55520,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -55457,7 +55529,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55472,7 +55544,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -55481,7 +55553,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55496,7 +55568,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -55505,7 +55577,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -128504,7 +128576,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -128513,7 +128585,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "size" : 1,
@@ -128531,7 +128603,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
-   "name" : "std::__make_tuple_indices<2, 0>",
+   "name" : "std::__make_tuple_indices<2>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
    "size" : 1,
@@ -150559,7 +150631,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -150599,7 +150671,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -150609,7 +150681,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -150619,7 +150691,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -150722,7 +150794,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -150836,7 +150908,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -150950,7 +151022,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151049,7 +151121,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -152020,7 +152092,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -152029,7 +152101,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -152121,7 +152193,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -152130,7 +152202,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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 b5508f2..c3d0a4c 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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5715,7 +5715,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "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" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6003,6 +6003,31 @@
    "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" :
    [
@@ -8058,7 +8083,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8076,7 +8101,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8115,7 +8140,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9858,7 +9883,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9909,7 +9934,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10256,7 +10281,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10280,7 +10305,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -10967,7 +10992,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -23013,7 +23038,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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -23049,7 +23074,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -23094,7 +23119,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -23103,7 +23128,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -23481,7 +23506,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23490,7 +23515,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -23508,7 +23533,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -24147,7 +24172,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -24174,7 +24199,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -24864,8 +24889,8 @@
    "alignment" : 8,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -27612,7 +27637,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -27747,7 +27772,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -27846,7 +27871,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -28028,7 +28053,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -30166,7 +30191,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30366,7 +30391,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30376,7 +30401,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -30584,7 +30609,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30594,7 +30619,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30604,7 +30629,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -30614,7 +30639,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -30732,7 +30757,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -31062,6 +31087,32 @@
    "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" :
    [
@@ -31133,7 +31184,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -31163,7 +31214,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -31839,7 +31890,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -31855,7 +31906,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -31889,6 +31940,27 @@
    "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" :
    [
@@ -32057,7 +32129,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32120,7 +32192,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32182,7 +32254,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -32304,7 +32376,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -32500,7 +32572,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -32526,7 +32598,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -32661,7 +32733,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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -33068,7 +33140,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -33120,7 +33192,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -33156,7 +33228,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -33380,7 +33452,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -33401,7 +33473,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -33570,7 +33642,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -33591,7 +33663,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -33863,7 +33935,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -33978,7 +34050,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -34039,7 +34111,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -34223,7 +34295,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -34244,7 +34316,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -34326,7 +34398,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -34347,7 +34419,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -34408,7 +34480,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -34728,7 +34800,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "access" : "protected",
@@ -41929,7 +42001,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "access" : "protected",
@@ -41974,7 +42046,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -67981,7 +68053,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<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 d5493bb..d974183 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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8224,7 +8224,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "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" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8492,6 +8492,31 @@
    "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" :
    [
@@ -8623,7 +8648,7 @@
    "referenced_type" : "_ZTI8$SHUT_RD",
    "self_type" : "_ZTI8$SHUT_RD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -11581,7 +11606,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_mPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11599,7 +11624,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11638,7 +11663,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvmmPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13705,7 +13730,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -13762,7 +13787,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13831,7 +13856,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFviP7siginfoPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -31781,7 +31806,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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "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" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35867,7 +35892,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -36137,7 +36162,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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -36182,7 +36207,7 @@
    "referenced_type" : "_ZTI5iovec",
    "self_type" : "_ZTIP5iovec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -36209,7 +36234,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 8,
@@ -36227,7 +36252,7 @@
    "referenced_type" : "_ZTI7siginfo",
    "self_type" : "_ZTIP7siginfo",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -36245,7 +36270,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -36371,7 +36396,7 @@
    "referenced_type" : "_ZTIFPvS_mPKvE",
    "self_type" : "_ZTIPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -36380,7 +36405,7 @@
    "referenced_type" : "_ZTIFPvmPKvE",
    "self_type" : "_ZTIPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -36398,7 +36423,7 @@
    "referenced_type" : "_ZTIFPvmmPKvE",
    "self_type" : "_ZTIPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -37181,7 +37206,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -37208,7 +37233,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -37244,7 +37269,7 @@
    "referenced_type" : "_ZTIFviP7siginfoPvE",
    "self_type" : "_ZTIPFviP7siginfoPvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -37397,7 +37422,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -37637,8 +37662,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.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",
+   "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",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -37880,8 +37905,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37889,8 +37914,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37898,8 +37923,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37907,8 +37932,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -40808,7 +40833,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -40880,7 +40905,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -45074,7 +45099,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 8,
@@ -45218,7 +45243,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -45317,7 +45342,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -45438,7 +45463,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 520,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -45588,7 +45613,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -49616,7 +49641,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -49976,7 +50001,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -49986,7 +50011,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 8,
@@ -50066,7 +50091,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -50184,7 +50209,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50234,7 +50259,7 @@
    "referenced_type" : "_ZTIPFPvS_mPKvE",
    "self_type" : "_ZTIVPFPvS_mPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50244,7 +50269,7 @@
    "referenced_type" : "_ZTIPFPvmPKvE",
    "self_type" : "_ZTIVPFPvmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50254,7 +50279,7 @@
    "referenced_type" : "_ZTIPFPvmmPKvE",
    "self_type" : "_ZTIVPFPvmmPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -50264,7 +50289,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50721,6 +50746,32 @@
    "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" :
    [
@@ -51103,7 +51154,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -51133,7 +51184,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -52285,7 +52336,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52301,7 +52352,28 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 48,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "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"
   },
   {
    "alignment" : 8,
@@ -52529,7 +52601,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52883,7 +52955,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52898,7 +52970,7 @@
    "referenced_type" : "_ZTI16sockaddr_storage",
    "self_type" : "_ZTI16sockaddr_storage",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -52929,7 +53001,7 @@
    "referenced_type" : "_ZTI16user_regs_struct",
    "self_type" : "_ZTI16user_regs_struct",
    "size" : 272,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -53140,7 +53212,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53455,7 +53527,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 16,
@@ -53481,7 +53553,7 @@
    "referenced_type" : "_ZTI18user_fpsimd_struct",
    "self_type" : "_ZTI18user_fpsimd_struct",
    "size" : 528,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -53602,7 +53674,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.UpsideDownCake_arm64_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 8,
@@ -54230,7 +54302,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -54347,7 +54419,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -54399,7 +54471,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 8,
@@ -54435,7 +54507,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -54587,7 +54659,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 96,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -54744,7 +54816,7 @@
    "referenced_type" : "_ZTI5ucred",
    "self_type" : "_ZTI5ucred",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -54760,7 +54832,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 8,
@@ -54781,7 +54853,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -54802,7 +54874,7 @@
    "referenced_type" : "_ZTI6linger",
    "self_type" : "_ZTI6linger",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -54848,7 +54920,7 @@
    "referenced_type" : "_ZTI6msghdr",
    "self_type" : "_ZTI6msghdr",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55103,7 +55175,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 8,
@@ -55134,7 +55206,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 8,
@@ -55160,7 +55232,7 @@
    "referenced_type" : "_ZTI7cmsghdr",
    "self_type" : "_ZTI7cmsghdr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55196,7 +55268,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -55217,7 +55289,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55253,7 +55325,7 @@
    "referenced_type" : "_ZTI7mmsghdr",
    "self_type" : "_ZTI7mmsghdr",
    "size" : 64,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55495,7 +55567,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -55610,7 +55682,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTI8sockaddr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55631,7 +55703,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -55692,7 +55764,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 4560,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 1,
@@ -55780,7 +55852,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -55801,7 +55873,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 8,
@@ -55883,7 +55955,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 80,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -55904,7 +55976,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 8,
@@ -55934,7 +56006,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -56254,7 +56326,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -56526,7 +56598,7 @@
    "referenced_type" : "_ZTIN16sockaddr_storageUt_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -56548,7 +56620,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.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -68916,7 +68988,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -68938,7 +69010,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm64_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -73500,7 +73572,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -73509,7 +73581,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -73524,7 +73596,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -73533,7 +73605,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -73548,7 +73620,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -73557,7 +73629,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -73572,7 +73644,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -73581,7 +73653,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -126223,7 +126295,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -140017,7 +140089,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -140160,7 +140232,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147873,7 +147945,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -157426,7 +157498,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -157466,7 +157538,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -157476,7 +157548,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -157486,7 +157558,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -158369,7 +158441,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -158378,7 +158450,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -158470,7 +158542,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -158479,7 +158551,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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 1c531d9..83c1a63 100644
--- a/34/64/arm64/source-based/libaudioutils.so.lsdump
+++ b/34/64/arm64/source-based/libaudioutils.so.lsdump
@@ -1971,6 +1971,14 @@
   },
   {
    "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"
   },
   {
@@ -3178,7 +3186,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3416,119 +3424,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -2080374784,
+     "enum_field_value" : 2214592512,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : -2013265920,
+     "enum_field_value" : 2281701376,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : -2013265919,
+     "enum_field_value" : 2281701377,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : -1879048192,
+     "enum_field_value" : 2415919104,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : -1610612736,
+     "enum_field_value" : 2684354560,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3540,15 +3548,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4351,15 +4359,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -551550977,
+     "enum_field_value" : 3743416319,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4841,99 +4849,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : -2147483137,
+     "enum_field_value" : 2147484159,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : -2147482625,
+     "enum_field_value" : 2147484671,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : -2147481601,
+     "enum_field_value" : 2147485695,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : -2147479553,
+     "enum_field_value" : 2147487743,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : -2147475457,
+     "enum_field_value" : 2147491839,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : -2147467265,
+     "enum_field_value" : 2147500031,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : -2147450881,
+     "enum_field_value" : 2147516415,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : -2147418113,
+     "enum_field_value" : 2147549183,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : -2147352577,
+     "enum_field_value" : 2147614719,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : -2147221505,
+     "enum_field_value" : 2147745791,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : -2146959361,
+     "enum_field_value" : 2148007935,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : -2146435073,
+     "enum_field_value" : 2148532223,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : -2145386497,
+     "enum_field_value" : 2149580799,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : -2143289345,
+     "enum_field_value" : 2151677951,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : -2139095041,
+     "enum_field_value" : 2155872255,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : -2130706433,
+     "enum_field_value" : 2164260863,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4949,7 +4957,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5671,7 +5679,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5746,7 +5754,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5767,7 +5775,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -14881,7 +14889,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfmmmS1_S3_mN7android11audio_utils7details13FILTER_OPTIONEELm32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -16520,7 +16528,7 @@
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
    "size" : 8,
@@ -16529,7 +16537,7 @@
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 8,
@@ -16538,7 +16546,7 @@
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 8,
@@ -16655,7 +16663,7 @@
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 8,
@@ -21364,7 +21372,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13__Float32x4_tfLb0EEE",
    "size" : 64,
@@ -21390,7 +21398,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 96,
@@ -21416,7 +21424,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 160,
@@ -21754,7 +21762,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
    "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 20bb035..8f06903 100644
--- a/34/64/arm64/source-based/libbase.so.lsdump
+++ b/34/64/arm64/source-based/libbase.so.lsdump
@@ -1087,12 +1087,21 @@
    "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"
   },
   {
@@ -1951,7 +1960,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -2002,7 +2011,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2758,7 +2767,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLm500ENSt3__19allocatorIcEEE4growEm",
    "parameters" :
    [
@@ -2792,7 +2801,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLm500ENSt3__19allocatorIwEEE4growEm",
    "parameters" :
    [
@@ -4917,6 +4926,23 @@
    "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" :
@@ -4935,6 +4961,22 @@
   },
   {
    "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" :
    [
@@ -4951,6 +4993,22 @@
   },
   {
    "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 a4b19c8..60fb43c 100644
--- a/34/64/arm64/source-based/libbinder.so.lsdump
+++ b/34/64/arm64/source-based/libbinder.so.lsdump
@@ -73,6 +73,15 @@
    "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]",
@@ -91,15 +100,6 @@
    "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,34 +1085,6 @@
    "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"
   },
   {
@@ -1884,214 +1856,6 @@
    "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"
   },
   {
@@ -2176,12 +1940,21 @@
    "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"
   },
   {
@@ -2347,22 +2120,6 @@
    "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_"
   },
   {
@@ -2378,22 +2135,6 @@
    "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"
   },
   {
@@ -2583,6 +2324,9 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
+   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
+  },
+  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2790,6 +2534,9 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
+   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
+  },
+  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3327,6 +3074,9 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
+   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
+  },
+  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3537,7 +3287,10 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvmEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvmEEE"
+  },
+  {
+   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3855,22 +3608,6 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedImEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
-  },
-  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -4000,6 +3737,9 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
+   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -4018,14 +3758,6 @@
    "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"
   },
   {
@@ -4209,198 +3941,6 @@
    "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"
   },
   {
@@ -4507,394 +4047,10 @@
   },
   {
    "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_"
   },
   {
@@ -4903,1269 +4059,9 @@
   },
   {
    "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"
   },
   {
@@ -6427,15 +4323,9 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
-   "name" : "_ZN7android16kEnableRecordingE"
-  },
-  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
-   "name" : "_ZN7android20kEnableRpcDevServersE"
-  },
-  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -6872,10 +4762,6 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android10PoolThreadE"
-  },
-  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -6903,10 +4789,6 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android15BpShellCallbackE"
-  },
-  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -6916,14 +4798,6 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android16BpResultReceiverE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
-  },
-  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -6987,14 +4861,6 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -7063,6 +4929,10 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android15RpcTransportRawE"
+  },
+  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -7086,6 +4956,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android18RpcTransportCtxRawE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -8654,7 +6528,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -8705,7 +6579,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -13092,104 +10966,6 @@
    "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" :
@@ -15675,849 +13451,6 @@
    "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" :
@@ -17039,6 +13972,23 @@
    "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" :
@@ -17057,6 +14007,22 @@
   },
   {
    "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" :
    [
@@ -17073,6 +14039,22 @@
   },
   {
    "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" :
    [
@@ -17721,114 +14703,6 @@
    "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" :
@@ -17901,114 +14775,6 @@
    "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" :
@@ -19034,6 +15800,19 @@
    "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" :
@@ -20141,6 +16920,12 @@
    "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" :
@@ -20935,6 +17720,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -20948,6 +17734,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -22748,7 +19535,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIb",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -22894,7 +19681,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvmEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvmEEE",
    "parameters" :
    [
     {
@@ -22902,7 +19689,23 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE"
+     "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"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24818,6 +21621,19 @@
    "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" :
@@ -24908,46 +21724,6 @@
    "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" :
@@ -25896,1062 +22672,6 @@
    "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" :
@@ -27782,10 +23502,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA20_KDs",
-   "name" : "const char16_t (&)[20]",
-   "referenced_type" : "_ZTIA20_KDs",
-   "self_type" : "_ZTIRA20_KDs",
+   "linker_set_key" : "_ZTIRA1_KDs",
+   "name" : "const char16_t (&)[1]",
+   "referenced_type" : "_ZTIA1_KDs",
+   "self_type" : "_ZTIRA1_KDs",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -27991,7 +23711,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.UpsideDownCake_arm64_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm64_armv8-a_static_afdo-libbinder_lto-thin/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"
@@ -28691,10 +24411,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILm20EEE",
-   "name" : "const android::String16::StaticData<20> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILm20EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILm20EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILm1EEE",
+   "name" : "const android::String16::StaticData<1> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILm1EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILm1EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -30721,8 +26441,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.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",
+   "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",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -33419,10 +29139,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILm20EEE",
-   "name" : "android::StaticString16<20> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILm20EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILm20EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILm1EEE",
+   "name" : "android::StaticString16<1> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILm1EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILm1EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -34103,6 +29823,15 @@
   },
   {
    "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",
@@ -34733,10 +30462,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILm20EEE",
-   "name" : "android::String16::StaticData<20> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILm20EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILm1EEE",
+   "name" : "android::String16::StaticData<1> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILm1EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -35578,6 +31307,16 @@
    "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",
@@ -35588,16 +31327,6 @@
    "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",
@@ -37866,11 +33595,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILm20EEE",
-   "name" : "const android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILm20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILm1EEE",
+   "name" : "const android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILm1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -37990,7 +33719,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 400,
+   "size" : 448,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -39401,6 +35130,46 @@
      "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",
@@ -50898,15 +46667,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILm20EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILm1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILm20EEE",
-   "name" : "android::StaticString16<20>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILm1EEE",
+   "name" : "android::StaticString16<1>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILm20EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILm20EEE",
-   "size" : 56,
+   "referenced_type" : "_ZTIN7android14StaticString16ILm1EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILm1EEE",
+   "size" : 16,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -54377,7 +50146,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "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"
+     "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"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -54427,6 +50196,34 @@
     {
      "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"
     },
     {
@@ -61909,6 +57706,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 792,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
@@ -64016,14 +59819,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA20_Ds"
+     "referenced_type" : "_ZTIA1_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILm20EEE",
-   "name" : "android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILm1EEE",
+   "name" : "android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -64465,7 +60268,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 1280,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE"
     },
     {
      "access" : "private",
@@ -64475,26 +60278,32 @@
     },
     {
      "access" : "private",
-     "field_name" : "mSessions",
+     "field_name" : "mServerSocketModifier",
      "field_offset" : 2048,
+     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSessions",
+     "field_offset" : 2432,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 2240,
+     "field_offset" : 2624,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 2304,
+     "field_offset" : 2688,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 2688,
+     "field_offset" : 3072,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -64503,12 +60312,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 400,
+   "size" : 448,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 384,
+     "component_value" : 432,
      "kind" : "vbase_offset"
     },
     {
@@ -64545,11 +60354,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -384,
+     "component_value" : -432,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -384,
+     "component_value" : -432,
      "kind" : "offset_to_top"
     },
     {
@@ -65696,10 +61505,10 @@
   },
   {
    "alignment" : 8,
-   "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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -65732,6 +61541,15 @@
   },
   {
    "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 0526ac5..88bbf63 100644
--- a/34/64/arm64/source-based/libc++.so.lsdump
+++ b/34/64/arm64/source-based/libc++.so.lsdump
@@ -2615,14 +2615,6 @@
    "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_"
   },
   {
@@ -3785,10 +3777,6 @@
    "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"
   },
   {
@@ -4429,34 +4417,10 @@
   },
   {
    "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_"
   },
   {
@@ -4472,22 +4436,6 @@
    "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"
   },
   {
@@ -4663,10 +4611,6 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcm"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNSt3__123mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EEclEv"
-  },
-  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -5055,34 +4999,10 @@
   },
   {
    "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_"
   },
   {
@@ -5099,50 +5019,10 @@
   },
   {
    "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_"
   },
   {
@@ -5159,22 +5039,6 @@
   },
   {
    "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_"
   },
   {
@@ -9951,7 +9815,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_grouping",
+   "function_name" : "std::moneypunct<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9965,7 +9829,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9979,7 +9843,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9993,7 +9857,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10007,7 +9871,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10021,7 +9885,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10035,7 +9899,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10049,7 +9913,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10063,7 +9927,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10203,7 +10067,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10217,7 +10081,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10231,7 +10095,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10245,7 +10109,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10259,7 +10123,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10273,7 +10137,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10287,7 +10151,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10301,7 +10165,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10315,7 +10179,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13234,7 +13098,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13248,7 +13112,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13262,7 +13126,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13276,7 +13140,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13290,7 +13154,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13304,7 +13168,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13318,7 +13182,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13332,7 +13196,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13346,7 +13210,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13486,7 +13350,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13500,7 +13364,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13514,7 +13378,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13528,7 +13392,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13542,7 +13406,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13556,7 +13420,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13570,7 +13434,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13584,7 +13448,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13598,7 +13462,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20329,50 +20193,6 @@
    "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" :
@@ -25803,25 +25623,6 @@
    "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" :
@@ -28572,7 +28373,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char, false>::init",
+   "function_name" : "std::moneypunct_byname<char>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28606,7 +28407,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28640,121 +28441,6 @@
   },
   {
    "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" :
    [
@@ -28778,29 +28464,6 @@
   },
   {
    "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" :
    [
@@ -28892,98 +28555,6 @@
    ]
   },
   {
-   "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",
@@ -29795,19 +29366,6 @@
    "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" :
@@ -31848,136 +31406,6 @@
   },
   {
    "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" :
    [
@@ -32004,32 +31432,6 @@
   },
   {
    "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" :
    [
@@ -32133,255 +31535,6 @@
    ]
   },
   {
-   "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" :
@@ -32412,35 +31565,6 @@
   },
   {
    "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" :
    [
@@ -32556,122 +31680,6 @@
    ]
   },
   {
-   "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" :
@@ -35556,13 +34564,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char, false>::id",
+   "name" : "std::moneypunct<char>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char, false>::intl",
+   "name" : "std::moneypunct<char>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -35580,13 +34588,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t, false>::id",
+   "name" : "std::moneypunct<wchar_t>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t, false>::intl",
+   "name" : "std::moneypunct<wchar_t>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -55393,7 +54401,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -55402,7 +54410,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55417,7 +54425,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -55426,7 +54434,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55441,7 +54449,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -55450,7 +54458,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55465,7 +54473,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -55474,7 +54482,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -116766,7 +115774,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -116775,7 +115783,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "size" : 1,
@@ -137279,7 +136287,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -137289,7 +136297,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
-   "name" : "std::ratio<1000000, 1>",
+   "name" : "std::ratio<1000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
@@ -137329,7 +136337,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -137339,7 +136347,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -137349,7 +136357,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -138600,7 +137608,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<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,
@@ -138609,7 +137617,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<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,
@@ -138618,7 +137626,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<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,
@@ -138632,7 +137640,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -138641,7 +137649,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<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,
@@ -138678,7 +137686,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__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,
@@ -138687,7 +137695,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__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,
@@ -138724,7 +137732,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__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,
@@ -138733,7 +137741,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__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,
@@ -138770,7 +137778,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__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,
@@ -138779,7 +137787,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__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,
@@ -138816,7 +137824,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__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,
@@ -138825,7 +137833,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__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,
@@ -138862,7 +137870,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -138871,7 +137879,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -138940,7 +137948,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -138949,7 +137957,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<__int128, std::ratio<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,
@@ -138986,7 +137994,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -138995,7 +138003,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -139064,7 +138072,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -139073,7 +138081,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -139188,7 +138196,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -139197,7 +138205,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<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 da89804..d103041 100644
--- a/34/64/arm64/source-based/libcap.so.lsdump
+++ b/34/64/arm64/source-based/libcap.so.lsdump
@@ -60,9 +60,6 @@
  "elf_functions" :
  [
   {
-   "name" : "_libcap_strdup"
-  },
-  {
    "name" : "cap_clear"
   },
   {
@@ -90,6 +87,9 @@
    "name" : "cap_fill"
   },
   {
+   "name" : "cap_fill_flag"
+  },
+  {
    "name" : "cap_free"
   },
   {
@@ -132,12 +132,21 @@
    "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"
   },
   {
@@ -195,6 +204,9 @@
    "name" : "cap_prctlw"
   },
   {
+   "name" : "cap_proc_root"
+  },
+  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -532,6 +544,27 @@
    "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" :
@@ -694,6 +727,33 @@
    "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" :
@@ -727,6 +787,18 @@
    "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",
@@ -834,7 +906,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -849,7 +921,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -879,7 +951,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -900,7 +972,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -915,7 +987,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -1009,6 +1081,18 @@
    "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 a293d0a..9fc3ad4 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 56,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1269,7 +1269,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "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/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/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" : -16,
+     "enum_field_value" : 18446744073709551600,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3619,7 +3619,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3977,7 +3977,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "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" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4281,11 +4281,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -6757,7 +6757,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7450,7 +7450,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7792,7 +7792,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7801,7 +7801,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -8226,7 +8226,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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 524bf5c..4f01be7 100644
--- a/34/64/arm64/source-based/libcrypto.so.lsdump
+++ b/34/64/arm64/source-based/libcrypto.so.lsdump
@@ -38,15 +38,6 @@
    "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]",
@@ -129,11 +120,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -603,6 +594,9 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
+   "name" : "ASN1_TIME_set_string_X509"
+  },
+  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1854,18 +1848,6 @@
    "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"
   },
   {
@@ -2610,6 +2592,18 @@
    "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"
   },
   {
@@ -3066,6 +3060,15 @@
    "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"
   },
   {
@@ -3501,6 +3504,9 @@
    "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"
   },
   {
@@ -3720,6 +3726,9 @@
    "name" : "EVP_sha256"
   },
   {
+   "name" : "EVP_sha256_final_with_secret_suffix"
+  },
+  {
    "name" : "EVP_sha384"
   },
   {
@@ -4167,6 +4176,69 @@
    "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"
   },
   {
@@ -4773,6 +4845,27 @@
    "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"
   },
   {
@@ -7362,36 +7455,9 @@
    "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"
   },
   {
@@ -7410,24 +7476,9 @@
    "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"
   },
   {
@@ -8492,23 +8543,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8872,6 +8923,30 @@
      "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"
     },
     {
@@ -10372,6 +10447,21 @@
    "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" :
@@ -16249,6 +16339,21 @@
    "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" :
@@ -17308,6 +17413,135 @@
    "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" :
@@ -19192,6 +19426,12 @@
    "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",
@@ -20716,6 +20956,318 @@
    "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" :
@@ -27231,10 +27783,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27303,7 +27855,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29319,7 +29871,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30108,7 +30660,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31353,7 +31905,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31374,7 +31926,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -35728,114 +36280,6 @@
    "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" :
@@ -35848,48 +36292,6 @@
    "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",
@@ -35968,66 +36370,6 @@
    "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" :
@@ -36043,18 +36385,6 @@
    "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" :
@@ -36885,24 +37215,6 @@
   },
   {
    "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",
@@ -37020,6 +37332,15 @@
   },
   {
    "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",
@@ -37911,10 +38232,10 @@
   },
   {
    "alignment" : 8,
-   "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",
+   "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",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38066,6 +38387,15 @@
    "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,
@@ -38336,6 +38666,15 @@
    "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,
@@ -39117,6 +39456,15 @@
   },
   {
    "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",
@@ -39131,7 +39479,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
   {
    "alignment" : 8,
@@ -39324,15 +39672,6 @@
   },
   {
    "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",
@@ -39734,7 +40073,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
    "alignment" : 8,
@@ -39806,7 +40145,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/bio.h"
   }
  ],
  "qualified_types" :
@@ -39868,7 +40207,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 392,
+   "size" : 544,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40190,7 +40529,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 728,
+   "size" : 712,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40210,7 +40549,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 72,
+   "size" : 88,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40610,17 +40949,15 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 144,
+   "size" : 128,
    "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"
   },
   {
@@ -40744,6 +41081,16 @@
   {
    "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",
@@ -40757,7 +41104,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   }
  ],
  "record_types" :
@@ -41000,6 +41347,42 @@
     {
      "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"
     },
     {
@@ -42149,7 +42532,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4736,
+     "field_offset" : 4608,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42157,7 +42540,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42185,22 +42568,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4992,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5184,
+     "field_offset" : 5056,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5696,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIm"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5760,
+     "field_offset" : 5632,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42208,7 +42591,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 728,
+   "size" : 712,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42501,7 +42884,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
+     "referenced_type" : "_ZTIA128_h"
     },
     {
      "field_name" : "block_used",
@@ -43031,7 +43414,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -43043,7 +43426,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 584,
+   "size" : 568,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43232,249 +43615,6 @@
    "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"
     },
@@ -43755,28 +43895,6 @@
    "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 305a6ec..4f48f00 100644
--- a/34/64/arm64/source-based/libcrypto_utils.so.lsdump
+++ b/34/64/arm64/source-based/libcrypto_utils.so.lsdump
@@ -137,13 +137,11 @@
  "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 f48a085..1ad7543 100644
--- a/34/64/arm64/source-based/libcurl.so.lsdump
+++ b/34/64/arm64/source-based/libcurl.so.lsdump
@@ -113,12 +113,6 @@
    "name" : "Curl_all_content_encodings"
   },
   {
-   "name" : "Curl_alpn_get_proxy_spec"
-  },
-  {
-   "name" : "Curl_alpn_get_spec"
-  },
-  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -209,9 +203,81 @@
    "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"
   },
   {
@@ -281,6 +347,9 @@
    "name" : "Curl_cf_def_send"
   },
   {
+   "name" : "Curl_cf_h1_proxy_insert_after"
+  },
+  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -293,6 +362,9 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
+   "name" : "Curl_cf_http_proxy_get_host"
+  },
+  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -368,15 +440,15 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard"
-  },
-  {
    "name" : "Curl_conn_cf_discard_all"
   },
   {
    "name" : "Curl_conn_cf_discard_chain"
   },
   {
+   "name" : "Curl_conn_cf_discard_sub"
+  },
+  {
    "name" : "Curl_conn_cf_get_select_socks"
   },
   {
@@ -386,6 +458,9 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
+   "name" : "Curl_conn_cf_is_ssl"
+  },
+  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -440,9 +515,6 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
-   "name" : "Curl_conn_http_proxy_add"
-  },
-  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -611,6 +683,72 @@
    "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"
   },
   {
@@ -683,6 +821,15 @@
    "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"
   },
   {
@@ -785,6 +932,9 @@
    "name" : "Curl_http_cookies"
   },
   {
+   "name" : "Curl_http_decode_status"
+  },
+  {
    "name" : "Curl_http_done"
   },
   {
@@ -812,6 +962,24 @@
    "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"
   },
   {
@@ -1487,6 +1655,9 @@
    "name" : "Curl_updatesocket"
   },
   {
+   "name" : "Curl_url_set_authority"
+  },
+  {
    "name" : "Curl_urldecode"
   },
   {
@@ -1850,6 +2021,9 @@
    "name" : "Curl_cfree"
   },
   {
+   "name" : "Curl_cft_h1_proxy"
+  },
+  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4257,6 +4431,10 @@
      "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
deleted file mode 100644
index 6122f78..0000000
--- a/34/64/arm64/source-based/libdiskconfig.so.lsdump
+++ /dev/null
@@ -1,642 +0,0 @@
-{
- "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 310f6d7..e3f8a61 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" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1606,7 +1606,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "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.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",
+   "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",
    "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.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",
+   "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",
    "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.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",
+   "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",
    "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 81f5b74..f5bea7b 100644
--- a/34/64/arm64/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/arm64/source-based/libdumpstateutil.so.lsdump
@@ -153,6 +153,9 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -202,6 +205,9 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -574,6 +580,12 @@
    "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",
@@ -712,6 +724,13 @@
   },
   {
    "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 31d7c4f..9d2be98 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 fe5e201..ecb9c68 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -985,7 +985,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -1003,7 +1003,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1080,7 +1080,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1139,7 +1139,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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 8572d96..947ba7a 100644
--- a/34/64/arm64/source-based/libhidlbase.so.lsdump
+++ b/34/64/arm64/source-based/libhidlbase.so.lsdump
@@ -264,14 +264,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -284,10 +276,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -300,10 +288,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -312,11 +296,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
   },
   {
    "binding" : "weak",
@@ -2366,26 +2350,6 @@
   },
   {
    "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"
   },
   {
@@ -2789,10 +2753,6 @@
   },
   {
    "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"
   },
   {
@@ -2809,10 +2769,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2877,6 +2833,10 @@
   },
   {
    "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"
+  },
+  {
+   "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_"
   },
   {
@@ -2885,10 +2845,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__18functionIFbbEEclEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__18functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS7_S7_S7_PNS_6vectorIPvNS_9allocatorIS9_EEEEEEclES5_S7_S7_S7_S7_SD_"
   },
   {
@@ -2897,14 +2853,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
   },
   {
@@ -2913,6 +2861,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -2925,18 +2877,10 @@
   },
   {
    "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_"
   },
   {
@@ -2953,14 +2897,6 @@
   },
   {
    "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"
   },
   {
@@ -2973,10 +2909,6 @@
   },
   {
    "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_"
   },
   {
@@ -2997,10 +2929,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -3045,6 +2973,10 @@
   },
   {
    "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_"
   },
   {
@@ -3061,10 +2993,6 @@
   },
   {
    "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"
   },
   {
@@ -3073,22 +3001,10 @@
   },
   {
    "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"
   },
   {
@@ -3097,14 +3013,6 @@
   },
   {
    "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_"
   },
   {
@@ -3113,10 +3021,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS_9allocatorIS7_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -3125,22 +3029,10 @@
   },
   {
    "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"
   },
   {
@@ -3153,26 +3045,10 @@
   },
   {
    "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"
   },
   {
@@ -3225,7 +3101,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3241,38 +3117,6 @@
   },
   {
    "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_"
   },
   {
@@ -3285,10 +3129,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3297,10 +3137,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3309,19 +3145,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3421,70 +3253,18 @@
   },
   {
    "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_"
   },
   {
@@ -3501,10 +3281,6 @@
   },
   {
    "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_"
   },
   {
@@ -3517,14 +3293,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_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_"
   },
   {
@@ -3541,14 +3309,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_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_"
   },
   {
@@ -3569,10 +3329,6 @@
   },
   {
    "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_PvEElEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSA_SA_"
   },
   {
@@ -3585,6 +3341,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS_9allocatorIS7_EEE21__push_back_slow_pathIRKS7_EEvOT_"
   },
   {
@@ -3597,10 +3357,6 @@
   },
   {
    "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_"
   },
   {
@@ -3613,10 +3369,6 @@
   },
   {
    "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_"
   },
   {
@@ -3625,30 +3377,10 @@
   },
   {
    "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"
   },
   {
@@ -3661,18 +3393,10 @@
   },
   {
    "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"
   },
   {
@@ -3689,10 +3413,6 @@
   },
   {
    "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_"
   },
   {
@@ -3701,10 +3421,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE6resizeEmRKS4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE8__appendEmRKS4_"
   },
   {
@@ -3713,22 +3429,10 @@
   },
   {
    "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_"
   },
   {
@@ -3737,14 +3441,6 @@
   },
   {
    "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"
   },
   {
@@ -3753,10 +3449,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -3765,10 +3457,6 @@
   },
   {
    "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"
   },
   {
@@ -4045,10 +3733,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -4080,10 +3764,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -4169,10 +3849,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -4320,10 +3996,6 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
-  },
-  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4333,10 +4005,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4346,10 +4014,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4376,10 +4040,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8764,42 +8424,6 @@
    "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" :
@@ -8848,22 +8472,6 @@
    "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" :
@@ -8913,22 +8521,6 @@
   },
   {
    "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" :
    [
@@ -8961,22 +8553,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "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_8hardware27hidl_binder_death_recipientEEE"
-    },
-    {
-     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-    }
-   ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::IBinder>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
@@ -8993,6 +8569,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::wp<android::hardware::BHwBinder>::operator=",
    "linker_set_key" : "_ZN7android2wpINS_8hardware9BHwBinderEEaSERKS3_",
    "parameters" :
@@ -19427,91 +19019,6 @@
   },
   {
    "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" :
    [
@@ -21881,8 +21388,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.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",
+   "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",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -23232,7 +22739,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.UpsideDownCake_arm64_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm64_armv8-a_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/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 20c5bb9..06911e7 100644
--- a/34/64/arm64/source-based/libmedia_helper.so.lsdump
+++ b/34/64/arm64/source-based/libmedia_helper.so.lsdump
@@ -668,21 +668,33 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10valueHacOnE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
+   "name" : "_ZN7android14AudioParameter11valueHacOffE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
+   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -704,6 +716,15 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -713,6 +734,9 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
+   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1426,12 +1450,24 @@
    "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",
@@ -1444,6 +1480,12 @@
    "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",
@@ -1456,6 +1498,12 @@
    "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",
@@ -1498,6 +1546,24 @@
    "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",
@@ -1516,6 +1582,12 @@
    "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 ef009cc..1c45e0c 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -205,7 +205,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5549,7 +5549,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "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/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5921,7 +5921,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "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" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -7273,6 +7273,10 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
+     "enum_field_value" : 10,
+     "name" : "android::ColorAspects::StandardDisplayP3"
+    },
+    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -7383,6 +7387,14 @@
      "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"
     }
@@ -10594,11 +10606,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -11185,11 +11197,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -11770,11 +11782,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12733,7 +12745,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12751,7 +12763,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12784,7 +12796,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12799,7 +12811,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12817,7 +12829,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12835,7 +12847,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12862,7 +12874,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12907,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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12925,7 +12937,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12946,7 +12958,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12970,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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13006,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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13045,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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13081,7 +13093,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13120,7 +13132,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13153,7 +13165,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13171,7 +13183,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13207,7 +13219,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13228,7 +13240,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -16999,7 +17011,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17008,7 +17020,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17035,7 +17047,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17062,7 +17074,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17089,7 +17101,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17107,7 +17119,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17224,7 +17236,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17233,7 +17245,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17242,7 +17254,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17251,7 +17263,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17260,7 +17272,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17269,7 +17281,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17278,7 +17290,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17296,7 +17308,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17305,7 +17317,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17314,7 +17326,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17323,7 +17335,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17332,7 +17344,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17341,7 +17353,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17350,7 +17362,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17359,7 +17371,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17368,7 +17380,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17377,7 +17389,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17395,7 +17407,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17404,7 +17416,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17431,7 +17443,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17449,7 +17461,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -18875,6 +18887,15 @@
   },
   {
    "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",
@@ -18983,6 +19004,15 @@
   },
   {
    "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",
@@ -20329,7 +20359,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -20356,7 +20386,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -20545,7 +20575,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20575,7 +20605,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22350,11 +22380,13 @@
    "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"
   },
   {
@@ -23172,7 +23204,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23228,7 +23260,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23413,7 +23445,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23557,7 +23589,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23850,7 +23882,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24232,7 +24264,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -35351,6 +35383,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 792,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
@@ -43461,6 +43499,15 @@
   },
   {
    "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 d20cd47..a35a76a 100644
--- a/34/64/arm64/source-based/libprocessgroup.so.lsdump
+++ b/34/64/arm64/source-based/libprocessgroup.so.lsdump
@@ -146,6 +146,12 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
+   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
+  },
+  {
+   "name" : "_Z24sendSignalToProcessGroupjii"
+  },
+  {
    "name" : "_Z24setProcessGroupSoftLimitjil"
   },
   {
@@ -244,7 +250,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1132,9 +1138,15 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1150,9 +1162,15 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1165,12 +1183,18 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1198,21 +1222,42 @@
    "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 4e71874..4282a1d 100644
--- a/34/64/arm64/source-based/libsqlite.so.lsdump
+++ b/34/64/arm64/source-based/libsqlite.so.lsdump
@@ -337,6 +337,9 @@
    "name" : "sqlite3_interrupt"
   },
   {
+   "name" : "sqlite3_is_interrupted"
+  },
+  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -691,6 +694,9 @@
    "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 1f3b99b..3bc332e 100644
--- a/34/64/arm64/source-based/libssl.so.lsdump
+++ b/34/64/arm64/source-based/libssl.so.lsdump
@@ -20,6 +20,15 @@
    "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]",
@@ -65,6 +74,15 @@
    "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]",
@@ -119,6 +137,15 @@
    "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]",
@@ -165,11 +192,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -200,6 +227,24 @@
    "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]",
@@ -531,6 +576,9 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
+   "name" : "SSL_CIPHER_get_handshake_digest"
+  },
+  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -555,9 +603,6 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
-   "name" : "SSL_CIPHER_get_value"
-  },
-  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -822,6 +867,9 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
+   "name" : "SSL_CTX_set1_group_ids"
+  },
+  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1383,6 +1431,24 @@
    "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"
   },
   {
@@ -1443,6 +1509,12 @@
    "name" : "SSL_get_finished"
   },
   {
+   "name" : "SSL_get_group_id"
+  },
+  {
+   "name" : "SSL_get_group_name"
+  },
+  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1464,6 +1536,9 @@
    "name" : "SSL_get_mode"
   },
   {
+   "name" : "SSL_get_negotiated_group"
+  },
+  {
    "name" : "SSL_get_options"
   },
   {
@@ -1734,6 +1809,9 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
+   "name" : "SSL_set1_group_ids"
+  },
+  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2112,6 +2190,9 @@
    "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"
   },
   {
@@ -6719,6 +6800,18 @@
    "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" :
@@ -6815,18 +6908,6 @@
    "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" :
@@ -7985,6 +8066,24 @@
    "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" :
@@ -10820,6 +10919,96 @@
    "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" :
@@ -11087,6 +11276,30 @@
    "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" :
@@ -11180,6 +11393,18 @@
    "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" :
@@ -12437,6 +12662,24 @@
    "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" :
@@ -14263,6 +14506,15 @@
   },
   {
    "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",
@@ -14290,6 +14542,15 @@
   },
   {
    "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",
@@ -14335,6 +14596,15 @@
   },
   {
    "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",
@@ -14344,6 +14614,15 @@
   },
   {
    "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",
@@ -14362,6 +14641,24 @@
   },
   {
    "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",
@@ -14389,6 +14686,24 @@
   },
   {
    "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",
@@ -14398,6 +14713,33 @@
   },
   {
    "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",
@@ -14551,6 +14893,15 @@
   },
   {
    "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",
@@ -14641,6 +14992,15 @@
   },
   {
    "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",
@@ -14761,15 +15121,6 @@
   },
   {
    "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",
@@ -15013,15 +15364,6 @@
   },
   {
    "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",
@@ -18244,6 +18586,15 @@
   },
   {
    "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",
@@ -18487,6 +18838,15 @@
   },
   {
    "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",
@@ -18496,6 +18856,15 @@
   },
   {
    "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",
@@ -18505,6 +18874,24 @@
   },
   {
    "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",
@@ -18550,6 +18937,15 @@
   },
   {
    "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",
@@ -19126,6 +19522,15 @@
   },
   {
    "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",
@@ -19135,6 +19540,24 @@
   },
   {
    "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",
@@ -19180,6 +19603,15 @@
   },
   {
    "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",
@@ -19342,15 +19774,6 @@
   },
   {
    "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",
@@ -19383,7 +19806,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
    "alignment" : 8,
@@ -19419,7 +19842,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 8,
@@ -19498,6 +19921,16 @@
    "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",
@@ -19528,6 +19961,16 @@
    "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",
@@ -19568,6 +20011,16 @@
    "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",
@@ -19598,6 +20051,26 @@
    "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",
@@ -19898,7 +20371,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20224,6 +20697,16 @@
    "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",
@@ -20396,13 +20879,11 @@
    "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"
   },
   {
@@ -20454,7 +20935,17 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 32,
+   "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,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20470,6 +20961,16 @@
   {
    "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",
@@ -20480,6 +20981,26 @@
   {
    "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",
@@ -20530,6 +21051,16 @@
   {
    "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",
@@ -20574,7 +21105,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" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22363,7 +22894,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4736,
+     "field_offset" : 4608,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22371,7 +22902,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22399,22 +22930,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4992,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5184,
+     "field_offset" : 5056,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5696,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIm"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5760,
+     "field_offset" : 5632,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22422,7 +22953,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 728,
+   "size" : 712,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23188,7 +23719,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -23200,7 +23731,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 584,
+   "size" : 568,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -23527,249 +24058,6 @@
    "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"
     },
@@ -24178,6 +24466,41 @@
    [
     {
      "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"
     }
    ],
@@ -24213,6 +24536,76 @@
    [
     {
      "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"
     }
    ],
@@ -24388,6 +24781,41 @@
    [
     {
      "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"
     }
    ],
@@ -26073,7 +26501,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" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26096,7 +26524,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" : 728,
+   "size" : 712,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26361,6 +26789,20 @@
   },
   {
    "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",
@@ -26375,6 +26817,34 @@
   },
   {
    "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 b532121..9ba8882 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" : 48,
+   "size" : 56,
    "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" : 48,
+   "size" : 56,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6729,13 +6729,19 @@
      "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" : 48,
+   "size" : 56,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6826,13 +6832,19 @@
      "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" : 48,
+   "size" : 56,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9095,7 +9107,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" : 48,
+   "size" : 56,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9114,7 +9126,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" : 48,
+   "size" : 56,
    "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 bf8481b..b5768aa 100644
--- a/34/64/arm64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/34/64/arm64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -1002,6 +1002,9 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
+   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjm"
   },
   {
@@ -8107,6 +8110,10 @@
     },
     {
      "enum_field_value" : 10,
+     "name" : "android::ColorUtils::kColorStandardDisplay_P3"
+    },
+    {
+     "enum_field_value" : 10,
      "name" : "android::ColorUtils::kColorStandardDCI_P3"
     },
     {
@@ -8459,6 +8466,10 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
+     "enum_field_value" : 10,
+     "name" : "android::ColorAspects::StandardDisplayP3"
+    },
+    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -8569,6 +8580,14 @@
      "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"
     }
@@ -11697,11 +11716,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12288,11 +12307,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12873,11 +12892,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14470,6 +14489,37 @@
   },
   {
    "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 e6f4380..7209f9c 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/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/e560d7b19ebf7276b3e850d3d346dec8/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/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/e560d7b19ebf7276b3e850d3d346dec8/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/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/e560d7b19ebf7276b3e850d3d346dec8/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 97d4fc5..49d9c5d 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.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",
+   "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",
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -651,6 +651,9 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
+   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjm"
   },
   {
@@ -8767,6 +8770,10 @@
     },
     {
      "enum_field_value" : 10,
+     "name" : "android::ColorUtils::kColorStandardDisplay_P3"
+    },
+    {
+     "enum_field_value" : 10,
      "name" : "android::ColorUtils::kColorStandardDCI_P3"
     },
     {
@@ -9119,6 +9126,10 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
+     "enum_field_value" : 10,
+     "name" : "android::ColorAspects::StandardDisplayP3"
+    },
+    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -9229,6 +9240,14 @@
      "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"
     }
@@ -14003,7 +14022,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "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" : "_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" : "_ZTIj"
@@ -14024,7 +14043,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "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" : "_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" : "_ZTIF13OMX_ERRORTYPEjP20OMX_BUFFERHEADERTYPEE",
@@ -14042,7 +14061,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "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" : "_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" : "_ZTIj"
@@ -14069,7 +14088,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "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" : "_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" : "_ZTIj"
@@ -14096,7 +14115,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "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" : "_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" : "_ZTIj"
@@ -14228,7 +14247,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "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" : "_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" : "_ZTIF13OMX_ERRORTYPEjjP20OMX_BUFFERHEADERTYPEE",
@@ -15709,6 +15728,37 @@
   },
   {
    "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" :
    [
@@ -20372,8 +20422,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20426,8 +20476,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -21029,8 +21079,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -21893,8 +21943,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.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",
+   "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",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -22937,8 +22987,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -23117,8 +23167,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -23503,8 +23553,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.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",
+   "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",
    "size" : 672,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h"
   },
@@ -24536,8 +24586,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.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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -24737,8 +24787,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.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",
+   "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",
    "size" : 24,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -25000,8 +25050,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.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",
+   "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",
    "size" : 160,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -25434,8 +25484,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.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",
+   "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",
    "size" : 80,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27707,8 +27757,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.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",
+   "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",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27893,8 +27943,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.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",
+   "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",
    "size" : 12,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29216,8 +29266,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.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",
+   "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",
    "size" : 180,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29504,8 +29554,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.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",
+   "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",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -29692,8 +29742,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.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",
+   "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",
    "size" : 40,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -29932,7 +29982,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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "bBuffersContiguous",
@@ -29947,8 +29997,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.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",
+   "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",
    "size" : 96,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -30146,8 +30196,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.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",
+   "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",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h"
   },
@@ -30504,8 +30554,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.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",
+   "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",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -32127,8 +32177,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.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",
+   "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",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h"
   },
@@ -32229,8 +32279,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.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",
+   "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",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -32877,15 +32927,15 @@
    [
     {
      "field_name" : "audio",
-     "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"
+     "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"
     },
     {
      "field_name" : "video",
-     "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"
+     "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"
     },
     {
      "field_name" : "image",
-     "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"
+     "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"
     },
     {
      "field_name" : "other",
@@ -32896,8 +32946,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.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",
+   "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",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -33485,13 +33535,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.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",
+   "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",
    "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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
     "_ZTIj"
    ]
   },
@@ -33531,13 +33581,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.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",
+   "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",
    "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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+    "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
     "_ZTIN7android2wpINS_4hidl4base4V1_05IBaseEEE"
    ]
   },
@@ -33623,14 +33673,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.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",
+   "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",
    "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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ]
   },
   {
@@ -34621,13 +34671,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.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",
+   "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",
    "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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ],
    "vtable_components" :
    [
@@ -35665,7 +35715,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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35755,13 +35805,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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35857,13 +35907,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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35874,8 +35924,8 @@
    ],
    "linker_set_key" : "_ZTIN7android15OMXNodeInstanceE",
    "name" : "android::OMXNodeInstance",
-   "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",
+   "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",
    "size" : 672,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/OMXNodeInstance.h",
    "vtable_components" :
@@ -43297,7 +43347,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.UpsideDownCake_arm64_armv8-a_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_arm64_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "protected",
@@ -43308,8 +43358,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.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",
+   "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",
    "size" : 176,
    "source_file" : "frameworks/av/media/libstagefright/omx/include/media/stagefright/omx/1.0/Omx.h",
    "vtable_components" :
@@ -45342,6 +45392,15 @@
   },
   {
    "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 3f6b105..499d23f 100644
--- a/34/64/arm64/source-based/libstagefright_omx_utils.so.lsdump
+++ b/34/64/arm64/source-based/libstagefright_omx_utils.so.lsdump
@@ -7259,6 +7259,10 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
+     "enum_field_value" : 10,
+     "name" : "android::ColorAspects::StandardDisplayP3"
+    },
+    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -7369,6 +7373,14 @@
      "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"
     }
@@ -9842,11 +9854,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24593,6 +24605,12 @@
     },
     {
      "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 a627678..aecfca3 100644
--- a/34/64/arm64/source-based/libtinyalsa.so.lsdump
+++ b/34/64/arm64/source-based/libtinyalsa.so.lsdump
@@ -219,6 +219,9 @@
    "name" : "pcm_get_subdevice"
   },
   {
+   "name" : "pcm_get_xruns"
+  },
+  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1299,6 +1302,18 @@
    "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 2ed3319..13f1356 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -133,7 +133,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -860,10 +860,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -872,18 +868,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1214,6 +1202,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1453,34 +1445,6 @@
    "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"
   },
   {
@@ -1508,10 +1472,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1528,10 +1488,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1551,10 +1507,6 @@
    "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"
   },
   {
@@ -2343,10 +2295,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_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_"
   },
   {
@@ -2359,10 +2307,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_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"
   },
   {
@@ -2379,18 +2323,10 @@
   },
   {
    "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"
   },
   {
@@ -2403,18 +2339,14 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EmmS9_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lm4EEEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvmEEES3_EERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS4_EEED2Ev"
   },
   {
@@ -2439,10 +2371,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLm128EEEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2507,14 +2435,6 @@
   },
   {
    "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_"
   },
   {
@@ -2527,26 +2447,10 @@
   },
   {
    "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_"
   },
   {
@@ -2555,15 +2459,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEm"
   },
   {
    "binding" : "weak",
@@ -2603,14 +2503,6 @@
   },
   {
    "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"
   },
   {
@@ -2627,14 +2519,6 @@
   },
   {
    "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"
   },
   {
@@ -2651,22 +2535,10 @@
   },
   {
    "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"
   },
   {
@@ -2679,17 +2551,9 @@
   },
   {
    "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"
   },
   {
@@ -4004,7 +3868,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -4020,11 +3884,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -4033,7 +3897,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4225,7 +4089,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4241,71 +4105,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4625,7 +4489,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4633,7 +4497,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7395,7 +7259,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8377,11 +8241,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8968,11 +8832,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9553,11 +9417,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10869,7 +10733,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10887,7 +10751,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10920,7 +10784,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10935,7 +10799,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10953,7 +10817,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10971,7 +10835,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10998,7 +10862,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11043,7 +10907,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11061,7 +10925,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11082,7 +10946,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11106,7 +10970,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11142,7 +11006,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11181,7 +11045,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11217,7 +11081,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11256,7 +11120,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11289,7 +11153,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11307,7 +11171,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11343,7 +11207,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11364,7 +11228,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14510,19 +14374,6 @@
    "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" :
@@ -14552,22 +14403,6 @@
    "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" :
@@ -14584,22 +14419,6 @@
    "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" :
@@ -16282,6 +16101,12 @@
    "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" :
@@ -22199,7 +22024,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22208,7 +22033,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22253,7 +22078,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22289,7 +22114,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22298,7 +22123,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22388,7 +22213,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22397,7 +22222,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22406,7 +22231,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22415,7 +22240,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22424,7 +22249,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22433,7 +22258,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22442,7 +22267,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22460,7 +22285,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22469,7 +22294,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22478,7 +22303,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22487,7 +22312,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22496,7 +22321,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22505,7 +22330,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22514,7 +22339,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22523,7 +22348,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22532,7 +22357,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22541,7 +22366,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22559,7 +22384,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22568,7 +22393,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22595,7 +22420,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22622,7 +22447,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -25547,7 +25372,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -25687,7 +25512,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25725,7 +25550,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28272,7 +28097,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28328,7 +28153,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28492,7 +28317,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28589,7 +28414,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28748,7 +28573,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28936,7 +28761,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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 b690c0a..06998b1 100644
--- a/34/64/arm64/source-based/libunwindstack.so.lsdump
+++ b/34/64/arm64/source-based/libunwindstack.so.lsdump
@@ -101,24 +101,6 @@
    "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]",
@@ -236,402 +218,369 @@
  "elf_functions" :
  [
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
+   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
+   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
   },
   {
-   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
+   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
+   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
   },
   {
-   "name" : "_RNvXs7_Cs5OIsIcU3KsB_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
   },
   {
-   "name" : "_RNvXs7_Csjhy8uZQdWLM_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs6_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_7Display3fmt"
   },
   {
-   "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" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
    "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcmEEE"
-  },
-  {
-   "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"
   },
   {
@@ -2520,45 +2469,6 @@
    "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"
   },
   {
@@ -3303,10 +3213,13 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
   },
   {
    "binding" : "weak",
@@ -3371,9 +3284,6 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
-   "name" : "_ZTVN11unwindstack10RegsMips64E"
-  },
-  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3565,9 +3475,6 @@
    "name" : "_ZTVN11unwindstack8RegsImplImEE"
   },
   {
-   "name" : "_ZTVN11unwindstack8RegsMipsE"
-  },
-  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3635,6 +3542,9 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
+  },
+  {
+   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3806,48 +3716,6 @@
    "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" :
    [
@@ -4178,163 +4046,6 @@
    "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" :
    [
@@ -4360,14 +4071,6 @@
     },
     {
      "enum_field_value" : 5,
-     "name" : "unwindstack::ARCH_MIPS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "unwindstack::ARCH_MIPS64"
-    },
-    {
-     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4635,163 +4338,6 @@
    [
     {
      "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"
     },
     {
@@ -4897,194 +4443,6 @@
    "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" :
@@ -7816,194 +7174,6 @@
    "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",
@@ -8936,15 +8106,6 @@
   },
   {
    "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",
@@ -9305,15 +8466,6 @@
   },
   {
    "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",
@@ -9830,82 +8982,6 @@
      "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",
@@ -10223,12 +9299,6 @@
   },
   {
    "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__18iteratorINS_26bidirectional_iterator_tagEPN11unwindstack8DwarfFdeElPS4_RS4_EE"
-    }
-   ],
    "fields" :
    [
     {
@@ -10635,32 +9705,6 @@
    "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" :
    [
@@ -11007,48 +10051,6 @@
      "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"
@@ -11442,68 +10444,6 @@
   },
   {
    "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" :
    [
     {
@@ -11906,22 +10846,6 @@
    "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"
     }
@@ -12084,103 +11008,6 @@
    "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"
     }
@@ -13764,82 +12591,6 @@
   },
   {
    "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 5ec9e09..5069926 100644
--- a/34/64/arm64/source-based/libutils.so.lsdump
+++ b/34/64/arm64/source-based/libutils.so.lsdump
@@ -493,10 +493,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -742,9 +738,6 @@
    "name" : "_ZN7android7String813appendFormatVEPKcSt9__va_list"
   },
   {
-   "name" : "_ZN7android7String816convertToResPathEv"
-  },
-  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1223,10 +1216,6 @@
   },
   {
    "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_"
   },
   {
@@ -1247,18 +1236,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_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_"
   },
   {
@@ -1282,10 +1263,6 @@
    "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"
   },
   {
@@ -5756,19 +5733,6 @@
    "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" :
@@ -7044,19 +7008,6 @@
    "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 8f9e75c..94c9f6c 100644
--- a/34/64/arm64/source-based/libxml2.so.lsdump
+++ b/34/64/arm64/source-based/libxml2.so.lsdump
@@ -719,6 +719,9 @@
    "name" : "xmlCtxtResetPush"
   },
   {
+   "name" : "xmlCtxtSetMaxAmplification"
+  },
+  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1403,6 +1406,9 @@
    "name" : "xmlMemShow"
   },
   {
+   "name" : "xmlMemSize"
+  },
+  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1916,6 +1922,9 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
+   "name" : "xmlParserInputBufferCreateString"
+  },
+  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3002,6 +3011,9 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
+   "name" : "xmlTextReaderSetMaxAmplification"
+  },
+  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5390,6 +5402,43 @@
    "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"
     },
@@ -5972,6 +6021,10 @@
      "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"
     },
@@ -9491,6 +9544,10 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -13971,6 +14028,21 @@
    "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" :
@@ -17220,6 +17292,18 @@
    "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" :
@@ -19743,6 +19827,18 @@
    "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" :
@@ -22619,7 +22715,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25407,6 +25503,21 @@
    "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" :
@@ -35290,13 +35401,18 @@
      "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" : 760,
+   "size" : 768,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -35980,7 +36096,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "standalone",
+     "field_name" : "flags",
      "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 c73c65f..5393e7d 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/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -140,12 +140,30 @@
    "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"
   },
   {
@@ -155,6 +173,15 @@
    "name" : "ABGRToUVRow_NEON"
   },
   {
+   "name" : "ABGRToYJRow_Any_NEON"
+  },
+  {
+   "name" : "ABGRToYJRow_C"
+  },
+  {
+   "name" : "ABGRToYJRow_NEON"
+  },
+  {
    "name" : "ABGRToYRow_Any_NEON"
   },
   {
@@ -554,6 +581,9 @@
    "name" : "ARGBToI420"
   },
   {
+   "name" : "ARGBToI420Alpha"
+  },
+  {
    "name" : "ARGBToI422"
   },
   {
@@ -860,6 +890,18 @@
    "name" : "DetilePlane"
   },
   {
+   "name" : "DetilePlane_16"
+  },
+  {
+   "name" : "DetileRow_16_Any_NEON"
+  },
+  {
+   "name" : "DetileRow_16_C"
+  },
+  {
+   "name" : "DetileRow_16_NEON"
+  },
+  {
    "name" : "DetileRow_Any_NEON"
   },
   {
@@ -881,6 +923,18 @@
    "name" : "DetileSplitUVRow_NEON"
   },
   {
+   "name" : "DetileToYUY2"
+  },
+  {
+   "name" : "DetileToYUY2_Any_NEON"
+  },
+  {
+   "name" : "DetileToYUY2_C"
+  },
+  {
+   "name" : "DetileToYUY2_NEON"
+  },
+  {
    "name" : "DivideRow_16_Any_NEON"
   },
   {
@@ -1031,6 +1085,9 @@
    "name" : "I010Copy"
   },
   {
+   "name" : "I010Rotate"
+  },
+  {
    "name" : "I010ToAB30"
   },
   {
@@ -1088,6 +1145,9 @@
    "name" : "I210Copy"
   },
   {
+   "name" : "I210Rotate"
+  },
+  {
    "name" : "I210ToAB30"
   },
   {
@@ -1139,6 +1199,9 @@
    "name" : "I212ToARGBRow_C"
   },
   {
+   "name" : "I212ToI420"
+  },
+  {
    "name" : "I212ToI422"
   },
   {
@@ -1181,6 +1244,12 @@
    "name" : "I410AlphaToARGBRow_C"
   },
   {
+   "name" : "I410Copy"
+  },
+  {
+   "name" : "I410Rotate"
+  },
+  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1196,9 +1265,15 @@
    "name" : "I410ToI010"
   },
   {
+   "name" : "I410ToI420"
+  },
+  {
    "name" : "I410ToI444"
   },
   {
+   "name" : "I412ToI420"
+  },
+  {
    "name" : "I412ToI444"
   },
   {
@@ -1307,6 +1382,9 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
+   "name" : "I420ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1421,6 +1499,18 @@
    "name" : "I422ToNV21"
   },
   {
+   "name" : "I422ToRAW"
+  },
+  {
+   "name" : "I422ToRGB24"
+  },
+  {
+   "name" : "I422ToRGB24Matrix"
+  },
+  {
+   "name" : "I422ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I422ToRGB24Row_Any_NEON"
   },
   {
@@ -1433,6 +1523,9 @@
    "name" : "I422ToRGB565"
   },
   {
+   "name" : "I422ToRGB565Matrix"
+  },
+  {
    "name" : "I422ToRGB565Row_Any_NEON"
   },
   {
@@ -1541,6 +1634,24 @@
    "name" : "I444ToNV21"
   },
   {
+   "name" : "I444ToRAW"
+  },
+  {
+   "name" : "I444ToRGB24"
+  },
+  {
+   "name" : "I444ToRGB24Matrix"
+  },
+  {
+   "name" : "I444ToRGB24Row_Any_NEON"
+  },
+  {
+   "name" : "I444ToRGB24Row_C"
+  },
+  {
+   "name" : "I444ToRGB24Row_NEON"
+  },
+  {
    "name" : "InitCpuFlags"
   },
   {
@@ -1637,6 +1748,12 @@
    "name" : "MM21ToNV12"
   },
   {
+   "name" : "MM21ToYUY2"
+  },
+  {
+   "name" : "MT2TToP010"
+  },
+  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -1667,12 +1784,6 @@
    "name" : "MergeARGBPlane"
   },
   {
-   "name" : "MergeARGBPlaneAlpha"
-  },
-  {
-   "name" : "MergeARGBPlaneOpaque"
-  },
-  {
    "name" : "MergeARGBRow_Any_NEON"
   },
   {
@@ -1766,6 +1877,9 @@
    "name" : "MirrorPlane"
   },
   {
+   "name" : "MirrorRow_16_C"
+  },
+  {
    "name" : "MirrorRow_Any_NEON"
   },
   {
@@ -1943,9 +2057,15 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
+   "name" : "P010ToI010"
+  },
+  {
    "name" : "P010ToP410"
   },
   {
+   "name" : "P012ToI012"
+  },
+  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2216,6 +2336,9 @@
    "name" : "RGBToYMatrixRow_NEON"
   },
   {
+   "name" : "RiscvCpuCaps"
+  },
+  {
    "name" : "RotatePlane"
   },
   {
@@ -2228,6 +2351,9 @@
    "name" : "RotatePlane90"
   },
   {
+   "name" : "RotatePlane_16"
+  },
+  {
    "name" : "Scale"
   },
   {
@@ -2372,6 +2498,9 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
+   "name" : "ScalePlaneDown2_16To8"
+  },
+  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -2405,6 +2534,12 @@
    "name" : "ScalePlane_16"
   },
   {
+   "name" : "ScaleRowDown2Box_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Box_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -2426,6 +2561,12 @@
    "name" : "ScaleRowDown2Box_Odd_NEON"
   },
   {
+   "name" : "ScaleRowDown2Linear_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -2438,6 +2579,12 @@
    "name" : "ScaleRowDown2Linear_NEON"
   },
   {
+   "name" : "ScaleRowDown2_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -2663,12 +2810,24 @@
    "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"
   },
   {
@@ -2783,12 +2942,6 @@
    "name" : "SplitARGBPlane"
   },
   {
-   "name" : "SplitARGBPlaneAlpha"
-  },
-  {
-   "name" : "SplitARGBPlaneOpaque"
-  },
-  {
    "name" : "SplitARGBRow_Any_NEON"
   },
   {
@@ -2879,9 +3032,21 @@
    "name" : "SwapUVRow_NEON"
   },
   {
+   "name" : "Transpose4x4_32_C"
+  },
+  {
+   "name" : "Transpose4x4_32_NEON"
+  },
+  {
    "name" : "TransposePlane"
   },
   {
+   "name" : "TransposePlane_16"
+  },
+  {
+   "name" : "TransposeUVWx8_16_C"
+  },
+  {
    "name" : "TransposeUVWx8_Any_NEON"
   },
   {
@@ -2894,6 +3059,9 @@
    "name" : "TransposeUVWxH_C"
   },
   {
+   "name" : "TransposeWx8_16_C"
+  },
+  {
    "name" : "TransposeWx8_Any_NEON"
   },
   {
@@ -2903,6 +3071,9 @@
    "name" : "TransposeWx8_NEON"
   },
   {
+   "name" : "TransposeWxH_16_C"
+  },
+  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -3005,6 +3176,12 @@
    "name" : "UYVYToYRow_NEON"
   },
   {
+   "name" : "UnpackMT2T_C"
+  },
+  {
+   "name" : "UnpackMT2T_NEON"
+  },
+  {
    "name" : "ValidateJpeg"
   },
   {
@@ -3032,6 +3209,15 @@
    "name" : "YUY2ToNV12"
   },
   {
+   "name" : "YUY2ToNVUVRow_Any_NEON"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_C"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_NEON"
+  },
+  {
    "name" : "YUY2ToUV422Row_Any_NEON"
   },
   {
@@ -3255,7 +3441,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3296,7 +3482,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3329,7 +3515,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3642,7 +3828,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -3891,7 +4077,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -3919,7 +4105,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -3943,7 +4129,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -3973,7 +4159,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_NEON",
@@ -3991,7 +4177,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -4009,7 +4195,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_NEON",
@@ -4027,7 +4213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4054,7 +4240,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -4072,7 +4258,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -4099,7 +4285,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -4138,7 +4324,112 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -4171,7 +4462,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -4204,7 +4495,79 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_NEON",
@@ -4228,7 +4591,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -4252,7 +4615,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_NEON",
@@ -4276,7 +4639,61 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_NEON",
@@ -4294,7 +4711,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -4312,7 +4729,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_NEON",
@@ -4330,7 +4747,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -4357,7 +4774,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -4375,7 +4792,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -4402,7 +4819,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -4420,7 +4837,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -4447,7 +4864,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -4465,7 +4882,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -4495,7 +4912,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -4516,7 +4933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -4543,7 +4960,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -4570,7 +4987,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_NEON",
@@ -4588,7 +5005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -4606,7 +5023,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_NEON",
@@ -4624,7 +5041,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -4651,7 +5068,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_NEON",
@@ -4669,7 +5086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -4687,7 +5104,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_NEON",
@@ -4705,7 +5122,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -4744,7 +5161,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_Any_NEON",
@@ -4768,7 +5185,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -4792,7 +5209,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_NEON",
@@ -4816,7 +5233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_Any_NEON",
@@ -4834,7 +5251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -4852,7 +5269,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_NEON",
@@ -4870,7 +5287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -4897,7 +5314,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_NEON",
@@ -4915,7 +5332,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -4933,7 +5350,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_NEON",
@@ -4951,7 +5368,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -4990,7 +5407,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_Any_NEON",
@@ -5014,7 +5431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -5038,7 +5455,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_NEON",
@@ -5062,7 +5479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_Any_NEON",
@@ -5080,7 +5497,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -5098,7 +5515,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_NEON",
@@ -5116,7 +5533,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -5149,7 +5566,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_NEON",
@@ -5170,7 +5587,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -5191,7 +5608,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_NEON",
@@ -5212,7 +5629,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -5236,7 +5653,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -5263,7 +5680,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_NEON",
@@ -5281,7 +5698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -5299,7 +5716,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_NEON",
@@ -5317,7 +5734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -5350,7 +5767,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -5371,7 +5788,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_NEON",
@@ -5392,7 +5809,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -5428,7 +5845,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -5458,7 +5875,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -5479,7 +5896,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_NEON",
@@ -5500,7 +5917,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -5530,7 +5947,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -5548,7 +5965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -5575,7 +5992,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -5602,7 +6019,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -5629,7 +6046,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -5647,7 +6064,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -5674,7 +6091,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -5692,7 +6109,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -5713,7 +6130,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -5740,7 +6157,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_NEON",
@@ -5758,7 +6175,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -5776,7 +6193,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_NEON",
@@ -5794,7 +6211,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -5821,7 +6238,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -5839,7 +6256,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_NEON",
@@ -5857,7 +6274,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -5884,7 +6301,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -5920,7 +6337,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -5950,7 +6367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -5974,7 +6391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -6001,7 +6418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_NEON",
@@ -6019,7 +6436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -6037,7 +6454,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_NEON",
@@ -6055,7 +6472,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -6088,7 +6505,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_NEON",
@@ -6109,7 +6526,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -6130,7 +6547,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_NEON",
@@ -6151,7 +6568,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -6181,7 +6598,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -6202,7 +6619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -6238,7 +6655,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -6262,7 +6679,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_NEON",
@@ -6286,7 +6703,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -6316,7 +6733,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -6343,7 +6790,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -6358,7 +6805,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_NEON",
@@ -6373,7 +6820,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_Any_NEON",
@@ -6391,7 +6838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -6409,7 +6856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_NEON",
@@ -6427,7 +6874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -6457,7 +6904,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -6478,7 +6925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_NEON",
@@ -6499,7 +6946,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -6529,7 +6976,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_NEON",
@@ -6550,7 +6997,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -6571,7 +7018,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_NEON",
@@ -6592,7 +7039,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -6619,7 +7066,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -6646,7 +7093,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -6673,7 +7120,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -6706,7 +7153,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_NEON",
@@ -6727,7 +7174,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -6748,7 +7195,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_NEON",
@@ -6769,7 +7216,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -6796,7 +7243,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_NEON",
@@ -6814,7 +7261,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -6832,7 +7279,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_NEON",
@@ -6850,7 +7297,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -6877,7 +7351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -6895,7 +7369,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -6922,7 +7396,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_NEON",
@@ -6940,7 +7414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -6958,7 +7432,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_NEON",
@@ -6976,7 +7450,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -7003,7 +7477,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_NEON",
@@ -7021,7 +7495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -7039,7 +7513,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_NEON",
@@ -7057,7 +7531,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -7084,7 +7558,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_NEON",
@@ -7102,7 +7576,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -7120,7 +7594,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_NEON",
@@ -7138,7 +7612,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -7165,7 +7666,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -7204,7 +7705,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -7243,7 +7789,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -7282,7 +7828,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -7309,7 +7855,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -7348,7 +7894,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -7387,7 +7933,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -7420,7 +7966,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -7453,7 +7999,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -7480,7 +8026,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_NEON",
@@ -7498,7 +8044,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -7516,7 +8062,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_NEON",
@@ -7534,7 +8080,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -7561,7 +8107,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_NEON",
@@ -7579,7 +8125,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -7597,7 +8143,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_NEON",
@@ -7615,7 +8161,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -7642,7 +8188,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -7672,7 +8218,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_NEON",
@@ -7693,7 +8239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -7707,14 +8253,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_NEON",
@@ -7728,14 +8274,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_NEON",
@@ -7753,7 +8299,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -7771,7 +8317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_NEON",
@@ -7789,7 +8335,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -7816,7 +8362,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_NEON",
@@ -7837,7 +8383,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -7858,7 +8404,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_NEON",
@@ -7879,7 +8425,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_NEON",
@@ -7903,7 +8449,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -7927,7 +8473,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_NEON",
@@ -7951,7 +8497,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_NEON",
@@ -7975,7 +8521,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -7999,7 +8545,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_NEON",
@@ -8023,7 +8569,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -8050,7 +8596,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_NEON",
@@ -8068,7 +8614,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -8086,7 +8632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_NEON",
@@ -8104,7 +8650,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_NEON",
@@ -8122,7 +8668,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -8140,7 +8686,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_NEON",
@@ -8158,7 +8704,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -8185,7 +8731,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -8212,7 +8758,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -8230,7 +8776,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -8263,7 +8809,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -8296,7 +8842,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_Any_NEON",
@@ -8317,7 +8863,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -8338,7 +8884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_NEON",
@@ -8359,7 +8905,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_Any_NEON",
@@ -8380,7 +8926,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -8401,7 +8947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_NEON",
@@ -8422,7 +8968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_Any_NEON",
@@ -8440,7 +8986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -8458,7 +9004,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_NEON",
@@ -8476,7 +9022,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -8518,7 +9064,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -8560,7 +9106,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -8605,7 +9151,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -8659,7 +9205,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -8716,7 +9262,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -8728,7 +9274,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -8755,7 +9301,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -8794,7 +9340,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_NEON",
@@ -8818,7 +9364,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -8842,7 +9388,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_NEON",
@@ -8866,7 +9412,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_NEON",
@@ -8884,7 +9430,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -8902,7 +9448,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_NEON",
@@ -8920,7 +9466,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -8959,7 +9505,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -8983,7 +9529,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -9004,7 +9550,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_Any_NEON",
@@ -9025,7 +9571,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -9046,7 +9592,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_NEON",
@@ -9067,7 +9613,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -9094,7 +9640,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -9121,7 +9667,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -9133,7 +9679,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
+   "source_file" : "external/libyuv/include/libyuv/video_common.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -9154,7 +9700,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -9172,7 +9718,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -9190,7 +9736,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -9217,7 +9763,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -9247,7 +9793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_NEON",
@@ -9268,7 +9814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -9289,7 +9835,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_NEON",
@@ -9310,7 +9856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -9340,7 +9886,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -9361,7 +9907,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -9403,7 +9949,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -9448,7 +9994,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -9505,7 +10051,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -9535,7 +10081,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -9565,7 +10111,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -9592,7 +10138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -9619,7 +10165,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -9637,7 +10183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_NEON",
@@ -9655,7 +10201,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -9673,7 +10219,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_NEON",
@@ -9691,7 +10237,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -9709,7 +10255,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -9736,7 +10282,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -9765,8 +10311,101 @@
      "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/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::DetileRow_Any_NEON",
@@ -9787,7 +10426,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -9808,7 +10447,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_NEON",
@@ -9829,7 +10468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -9865,7 +10504,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_NEON",
@@ -9889,7 +10528,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -9913,7 +10552,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_NEON",
@@ -9937,7 +10576,124 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_NEON",
@@ -9958,7 +10714,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -9979,7 +10735,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_NEON",
@@ -10000,7 +10756,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -10015,7 +10771,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -10030,7 +10786,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -10060,7 +10846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_NEON",
@@ -10090,7 +10876,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -10117,7 +10903,25 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -10135,7 +10939,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_NEON",
@@ -10153,13 +10957,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -10198,7 +11002,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -10237,7 +11041,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -10276,7 +11080,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -10315,7 +11119,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -10354,7 +11158,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -10393,7 +11197,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -10432,7 +11236,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -10471,7 +11275,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -10510,7 +11314,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -10549,7 +11353,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -10588,7 +11392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -10627,7 +11431,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -10666,7 +11470,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -10705,7 +11509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -10744,7 +11548,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -10783,7 +11587,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -10822,7 +11626,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -10861,7 +11665,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -10900,7 +11704,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_Any_NEON",
@@ -10921,7 +11725,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_NEON",
@@ -10942,7 +11746,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -10972,7 +11776,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_NEON",
@@ -10993,7 +11797,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -11014,7 +11818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_NEON",
@@ -11035,7 +11839,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -11068,7 +11872,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -11095,7 +11899,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_NEON",
@@ -11122,7 +11926,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -11140,7 +11944,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_NEON",
@@ -11158,7 +11962,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -11176,7 +11980,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -11194,7 +11998,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -11245,7 +12049,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -11299,7 +12103,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -11350,7 +12154,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -11389,7 +12247,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -11428,7 +12286,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -11467,7 +12325,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -11509,7 +12367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -11554,7 +12412,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -11593,7 +12451,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -11635,7 +12493,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -11680,7 +12538,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -11731,7 +12589,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -11782,7 +12640,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -11827,7 +12685,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -11869,7 +12727,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -11911,7 +12769,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -11962,7 +12820,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -12007,7 +12865,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -12058,7 +12916,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -12112,7 +12970,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -12142,7 +13000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -12193,7 +13051,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -12232,7 +13144,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -12271,7 +13183,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -12310,7 +13222,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -12352,7 +13264,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -12397,7 +13309,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -12424,7 +13336,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -12463,7 +13375,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -12505,7 +13417,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -12550,7 +13462,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -12577,7 +13489,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -12628,7 +13540,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -12679,7 +13591,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -12730,7 +13642,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -12781,7 +13693,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -12826,7 +13738,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -12853,7 +13765,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -12880,7 +13792,58 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -12931,7 +13894,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -12976,7 +13939,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -13003,7 +13966,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -13030,7 +13993,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -13057,7 +14020,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -13087,7 +14050,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_NEON",
@@ -13108,7 +14071,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -13129,7 +14092,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_NEON",
@@ -13150,7 +14113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -13177,7 +14140,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -13216,7 +14179,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -13249,7 +14212,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -13300,7 +14263,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -13330,7 +14293,112 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -13372,7 +14440,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -13399,7 +14467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -13441,7 +14509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -13468,7 +14536,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -13519,7 +14587,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -13570,7 +14689,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -13621,7 +14791,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -13669,7 +14839,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -13717,7 +14887,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -13768,7 +14938,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -13822,7 +14992,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -13897,7 +15067,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -13948,7 +15118,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -14020,7 +15190,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -14071,7 +15241,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -14122,7 +15292,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -14170,7 +15340,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -14224,7 +15394,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -14284,7 +15454,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -14344,7 +15514,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -14404,7 +15574,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -14455,7 +15625,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -14494,7 +15664,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -14533,7 +15703,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -14572,7 +15742,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -14614,7 +15784,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -14653,7 +15823,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -14692,7 +15862,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -14731,7 +15901,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -14773,7 +15943,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -14818,7 +15988,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -14857,7 +16027,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -14908,7 +16078,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -14959,7 +16129,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -14998,7 +16168,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -15049,7 +16219,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -15100,7 +16270,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -15145,7 +16315,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -15190,7 +16360,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -15229,7 +16399,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -15268,7 +16438,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -15310,7 +16480,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -15349,7 +16564,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -15391,7 +16606,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -15433,7 +16648,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -15472,7 +16687,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -15514,7 +16729,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -15553,7 +16768,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -15592,7 +16807,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -15640,7 +16855,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -15688,7 +16903,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -15739,7 +16954,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -15793,7 +17008,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_NEON",
@@ -15823,7 +17038,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -15853,7 +17068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_NEON",
@@ -15883,7 +17098,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -15934,7 +17149,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -15988,7 +17203,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -16048,7 +17263,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -16108,7 +17323,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -16168,7 +17383,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -16207,7 +17422,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -16234,7 +17449,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -16273,7 +17488,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_NEON",
@@ -16300,7 +17515,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -16327,7 +17542,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_NEON",
@@ -16354,7 +17569,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_NEON",
@@ -16381,7 +17596,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -16408,7 +17623,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_NEON",
@@ -16435,7 +17650,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -16477,7 +17692,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -16522,7 +17737,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_NEON",
@@ -16549,7 +17764,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -16576,7 +17791,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_NEON",
@@ -16603,7 +17818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -16642,7 +17857,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -16693,7 +17908,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -16744,7 +17959,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -16795,7 +18010,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -16840,7 +18055,172 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_NEON",
@@ -16867,7 +18247,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -16894,7 +18274,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_NEON",
@@ -16921,7 +18301,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -16960,7 +18340,49 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_NEON",
@@ -16987,7 +18409,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -17014,7 +18436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_NEON",
@@ -17041,7 +18463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -17080,7 +18502,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -17122,7 +18544,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_NEON",
@@ -17149,7 +18571,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -17176,7 +18598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_NEON",
@@ -17203,7 +18625,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -17242,7 +18664,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_NEON",
@@ -17266,7 +18688,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -17290,7 +18712,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_NEON",
@@ -17314,7 +18736,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -17353,7 +18775,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_NEON",
@@ -17377,7 +18799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -17401,7 +18823,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_NEON",
@@ -17425,7 +18847,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -17473,7 +18895,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -17521,7 +18943,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -17572,7 +18994,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_NEON",
@@ -17602,7 +19024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -17632,7 +19054,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_NEON",
@@ -17662,7 +19084,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -17713,7 +19135,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -17767,7 +19189,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -17827,7 +19249,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -17887,7 +19309,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -17947,7 +19369,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -17986,7 +19408,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -18025,7 +19447,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -18067,7 +19489,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_NEON",
@@ -18094,7 +19516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -18121,7 +19543,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_NEON",
@@ -18148,7 +19570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -18199,7 +19621,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -18244,7 +19666,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -18289,13 +19711,214 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -18331,7 +19954,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -18367,7 +19990,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_Any_NEON",
@@ -18394,7 +20017,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -18421,7 +20044,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_NEON",
@@ -18448,7 +20071,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_Any_NEON",
@@ -18472,7 +20095,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -18496,7 +20119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_NEON",
@@ -18520,7 +20143,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_NEON",
@@ -18544,7 +20167,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -18568,7 +20191,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_NEON",
@@ -18592,7 +20215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -18619,7 +20242,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_NEON",
@@ -18637,7 +20260,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -18655,7 +20278,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_NEON",
@@ -18673,7 +20296,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -18712,7 +20335,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -18751,7 +20374,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -18790,7 +20413,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -18829,7 +20452,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -18868,7 +20491,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -18907,7 +20530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -18946,7 +20569,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -18985,7 +20608,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -19024,7 +20647,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -19045,7 +20668,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -19078,7 +20701,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -19123,7 +20746,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -19162,7 +20785,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -19201,7 +20824,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -19246,7 +20869,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -19285,7 +20908,79 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -19297,7 +20992,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -19345,7 +21040,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_NEON",
@@ -19375,7 +21070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -19405,7 +21100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_NEON",
@@ -19435,7 +21130,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -19483,7 +21178,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_NEON",
@@ -19513,7 +21208,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -19543,7 +21238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_NEON",
@@ -19573,7 +21268,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -19618,7 +21313,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_NEON",
@@ -19645,7 +21340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -19672,7 +21367,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_NEON",
@@ -19699,7 +21394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -19738,7 +21433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -19762,7 +21457,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_NEON",
@@ -19786,7 +21481,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -19819,7 +21514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -19855,7 +21550,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_NEON",
@@ -19879,7 +21574,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -19903,7 +21598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_NEON",
@@ -19927,7 +21622,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_NEON",
@@ -19948,7 +21643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -19969,7 +21664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_NEON",
@@ -19990,7 +21685,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -20032,7 +21727,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_Any_NEON",
@@ -20059,7 +21754,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_NEON",
@@ -20086,7 +21781,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_NEON",
@@ -20113,7 +21808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -20140,7 +21835,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_NEON",
@@ -20167,7 +21862,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_NEON",
@@ -20194,7 +21889,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -20221,7 +21916,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_NEON",
@@ -20248,7 +21943,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_NEON",
@@ -20275,7 +21970,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -20302,7 +21997,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_NEON",
@@ -20329,7 +22024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_NEON",
@@ -20353,7 +22048,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -20377,7 +22072,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_NEON",
@@ -20401,7 +22096,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -20413,7 +22108,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -20440,7 +22135,25 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_NEON",
@@ -20458,7 +22171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -20476,7 +22189,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_NEON",
@@ -20494,7 +22207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -20515,7 +22228,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_NEON",
@@ -20536,7 +22249,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -20563,7 +22276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_NEON",
@@ -20581,7 +22294,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -20599,7 +22312,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_NEON",
@@ -20617,7 +22330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_NEON",
@@ -20638,7 +22351,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -20659,7 +22372,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_NEON",
@@ -20680,7 +22393,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -20719,7 +22432,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -20758,7 +22471,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -20806,7 +22519,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -20839,7 +22552,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -20872,7 +22585,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -20908,7 +22621,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_NEON",
@@ -20932,7 +22645,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -20956,7 +22669,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_NEON",
@@ -20980,7 +22693,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -21025,7 +22738,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -21073,7 +22786,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -21112,7 +22825,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -21145,7 +22858,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -21178,7 +22891,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -21214,7 +22927,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_NEON",
@@ -21238,7 +22951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -21262,7 +22975,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_NEON",
@@ -21286,7 +22999,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -21319,7 +23032,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -21355,7 +23068,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_NEON",
@@ -21379,7 +23092,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -21403,7 +23116,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_NEON",
@@ -21427,7 +23140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -21466,7 +23179,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -21505,7 +23218,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -21538,7 +23251,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -21571,7 +23284,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -21607,7 +23320,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_NEON",
@@ -21631,7 +23344,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -21655,7 +23368,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_NEON",
@@ -21679,7 +23392,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -21724,7 +23437,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -21763,7 +23476,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -21796,7 +23509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -21829,7 +23542,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -21865,7 +23578,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_NEON",
@@ -21889,7 +23602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -21913,7 +23626,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_NEON",
@@ -21937,7 +23650,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -21970,7 +23683,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_NEON",
@@ -21991,7 +23704,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -22012,7 +23725,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_NEON",
@@ -22033,7 +23746,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -22069,7 +23782,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -22108,7 +23821,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -22144,7 +23857,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -22183,7 +23896,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -22222,7 +23980,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -22258,7 +24061,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -22297,7 +24100,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -22321,7 +24124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -22357,7 +24160,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -22396,7 +24199,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -22420,7 +24223,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -22459,7 +24262,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -22483,7 +24286,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -22507,7 +24310,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -22534,7 +24337,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_NEON",
@@ -22552,7 +24355,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -22570,7 +24373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_NEON",
@@ -22588,7 +24391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -22627,7 +24430,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -22654,7 +24457,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -22693,7 +24496,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -22726,7 +24529,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -22753,7 +24556,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_NEON",
@@ -22771,7 +24574,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -22789,7 +24592,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_NEON",
@@ -22807,7 +24610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -22834,7 +24637,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_NEON",
@@ -22852,7 +24655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -22870,7 +24673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_NEON",
@@ -22888,7 +24691,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_Any_NEON",
@@ -22912,7 +24715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -22936,7 +24739,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_NEON",
@@ -22960,7 +24763,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_Any_NEON",
@@ -22984,7 +24787,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -23008,7 +24811,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_NEON",
@@ -23032,7 +24835,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_NEON",
@@ -23050,7 +24853,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -23068,7 +24871,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_NEON",
@@ -23086,7 +24889,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_Any_NEON",
@@ -23104,7 +24907,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -23122,7 +24925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_NEON",
@@ -23140,7 +24943,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -23167,7 +24970,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_NEON",
@@ -23185,7 +24988,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -23203,7 +25006,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_NEON",
@@ -23221,7 +25024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -23248,7 +25051,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_NEON",
@@ -23266,7 +25069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -23284,7 +25087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_NEON",
@@ -23302,7 +25105,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -23341,7 +25144,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -23368,7 +25171,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -23407,7 +25210,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_Any_NEON",
@@ -23431,7 +25234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -23455,7 +25258,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_NEON",
@@ -23479,7 +25282,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_Any_NEON",
@@ -23503,7 +25306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -23527,7 +25330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_NEON",
@@ -23551,7 +25354,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_NEON",
@@ -23569,7 +25372,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -23587,7 +25390,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_NEON",
@@ -23605,7 +25408,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_Any_NEON",
@@ -23623,7 +25426,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -23641,7 +25444,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_NEON",
@@ -23659,7 +25462,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -23686,7 +25489,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_NEON",
@@ -23704,7 +25507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -23722,7 +25525,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_NEON",
@@ -23740,7 +25543,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -23779,7 +25582,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_Any_NEON",
@@ -23803,7 +25606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -23827,7 +25630,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_NEON",
@@ -23851,7 +25654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_Any_NEON",
@@ -23869,7 +25672,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -23887,7 +25690,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_NEON",
@@ -23905,7 +25708,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -23932,7 +25735,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -23971,7 +25774,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -23998,7 +25801,31 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_NEON",
@@ -24022,7 +25849,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -24046,7 +25873,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_NEON",
@@ -24070,7 +25897,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_NEON",
@@ -24088,7 +25915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -24106,7 +25933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_NEON",
@@ -24124,7 +25951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_NEON",
@@ -24142,7 +25969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -24160,7 +25987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_NEON",
@@ -24178,7 +26005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -24208,7 +26035,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -24238,7 +26065,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -24256,7 +26083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -24292,7 +26119,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -24322,7 +26161,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -24349,7 +26188,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -24376,7 +26215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -24403,7 +26242,37 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "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"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -24463,7 +26332,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -24487,7 +26356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -24511,7 +26380,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_Any_NEON",
@@ -24535,7 +26404,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -24559,7 +26428,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_NEON",
@@ -24583,7 +26452,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -24607,7 +26476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_Any_NEON",
@@ -24631,7 +26500,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -24655,7 +26524,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_NEON",
@@ -24679,7 +26548,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_NEON",
@@ -24700,7 +26569,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -24721,7 +26590,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_NEON",
@@ -24742,7 +26611,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_NEON",
@@ -24763,7 +26632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -24784,7 +26653,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_NEON",
@@ -24805,7 +26674,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_NEON",
@@ -24826,7 +26695,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -24847,7 +26716,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_NEON",
@@ -24868,7 +26737,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_NEON",
@@ -24892,7 +26761,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -24916,7 +26785,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_NEON",
@@ -24940,7 +26809,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_NEON",
@@ -24964,7 +26833,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -24988,7 +26857,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_NEON",
@@ -25012,7 +26881,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -25030,7 +26899,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_NEON",
@@ -25048,7 +26917,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -25066,7 +26935,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_NEON",
@@ -25084,7 +26953,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -25108,7 +26977,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -25132,7 +27001,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -25156,7 +27025,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -25180,7 +27049,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -25204,7 +27073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -25228,7 +27097,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -25252,7 +27121,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_Any_NEON",
@@ -25276,7 +27145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -25300,7 +27169,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_NEON",
@@ -25324,7 +27193,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -25348,7 +27217,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -25369,7 +27238,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_NEON",
@@ -25390,7 +27259,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -25426,7 +27295,46 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -25471,7 +27379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -25516,7 +27424,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -25564,7 +27472,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -25600,7 +27508,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -25636,7 +27544,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -25657,7 +27613,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_NEON",
@@ -25678,7 +27634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -25699,7 +27655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_NEON",
@@ -25720,7 +27676,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -25741,7 +27697,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_NEON",
@@ -25762,7 +27718,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -25783,7 +27787,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_NEON",
@@ -25804,7 +27808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -25825,7 +27829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_NEON",
@@ -25846,7 +27850,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -25867,7 +27919,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_NEON",
@@ -25888,7 +27940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -25909,7 +27961,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_NEON",
@@ -25930,7 +27982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -25951,7 +28003,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_NEON",
@@ -25972,7 +28024,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -25993,7 +28045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_NEON",
@@ -26014,7 +28066,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -26035,7 +28087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -26056,7 +28108,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_NEON",
@@ -26077,7 +28129,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -26098,7 +28150,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_NEON",
@@ -26119,7 +28171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_NEON",
@@ -26140,7 +28192,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -26161,7 +28213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_NEON",
@@ -26182,7 +28234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -26203,7 +28255,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -26224,7 +28276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_NEON",
@@ -26245,7 +28297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -26266,7 +28318,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_NEON",
@@ -26287,7 +28339,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -26308,7 +28360,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_NEON",
@@ -26329,7 +28381,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -26350,7 +28402,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_NEON",
@@ -26371,7 +28423,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_NEON",
@@ -26392,7 +28444,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -26413,7 +28465,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_NEON",
@@ -26434,7 +28486,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -26455,7 +28507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_NEON",
@@ -26476,7 +28528,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -26497,7 +28549,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_NEON",
@@ -26518,7 +28570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -26539,7 +28591,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_NEON",
@@ -26560,7 +28612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -26581,7 +28633,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_NEON",
@@ -26602,7 +28654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_NEON",
@@ -26626,7 +28678,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_NEON",
@@ -26650,7 +28702,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -26674,7 +28726,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_NEON",
@@ -26698,7 +28750,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -26722,7 +28774,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_NEON",
@@ -26746,7 +28798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -26770,7 +28822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_NEON",
@@ -26794,7 +28846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -26818,7 +28870,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_NEON",
@@ -26842,7 +28894,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_NEON",
@@ -26860,7 +28912,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_NEON",
@@ -26878,7 +28930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -26896,7 +28948,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_NEON",
@@ -26914,7 +28966,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -26932,7 +28984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_NEON",
@@ -26950,7 +29002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -26968,7 +29020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_NEON",
@@ -26986,7 +29038,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -27004,7 +29056,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_NEON",
@@ -27022,7 +29074,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -27043,7 +29095,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_NEON",
@@ -27064,7 +29116,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -27100,7 +29152,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -27121,7 +29173,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_NEON",
@@ -27142,7 +29194,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -27166,7 +29218,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -27190,7 +29242,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -27214,7 +29266,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -27238,7 +29290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -27262,7 +29314,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_NEON",
@@ -27283,7 +29335,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -27304,7 +29356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_NEON",
@@ -27325,7 +29377,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -27346,7 +29419,49 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -27367,7 +29482,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -27391,7 +29527,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_Any_NEON",
@@ -27415,7 +29551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -27439,7 +29575,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_NEON",
@@ -27463,7 +29599,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -27487,7 +29623,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_NEON",
@@ -27511,7 +29647,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -27535,7 +29671,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_NEON",
@@ -27559,7 +29695,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -27583,7 +29719,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_NEON",
@@ -27607,7 +29743,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -27631,7 +29767,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_NEON",
@@ -27655,7 +29791,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -27673,7 +29809,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_NEON",
@@ -27691,7 +29827,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -27709,7 +29845,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_NEON",
@@ -27727,7 +29863,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -27745,7 +29881,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_NEON",
@@ -27763,7 +29899,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -27781,7 +29917,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_NEON",
@@ -27799,7 +29935,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -27823,7 +29959,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_NEON",
@@ -27841,7 +29977,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -27859,7 +29995,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_NEON",
@@ -27877,7 +30013,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_NEON",
@@ -27898,7 +30034,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -27919,7 +30055,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_NEON",
@@ -27940,7 +30076,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_NEON",
@@ -27961,7 +30097,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -27982,7 +30118,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_NEON",
@@ -28003,7 +30139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -28027,7 +30163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_NEON",
@@ -28051,7 +30187,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_NEON",
@@ -28072,7 +30208,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -28093,7 +30229,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_NEON",
@@ -28114,7 +30250,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -28135,7 +30271,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_NEON",
@@ -28156,7 +30292,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -28201,7 +30337,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_NEON",
@@ -28228,7 +30364,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -28255,7 +30391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_NEON",
@@ -28282,7 +30418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -28321,7 +30457,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_NEON",
@@ -28345,7 +30481,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -28369,7 +30505,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_NEON",
@@ -28393,7 +30529,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -28429,7 +30565,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -28462,7 +30598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -28495,7 +30631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -28528,7 +30664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -28561,7 +30697,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -28594,7 +30730,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -28630,7 +30766,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_NEON",
@@ -28654,7 +30790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -28678,7 +30814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_NEON",
@@ -28702,7 +30838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_NEON",
@@ -28723,7 +30859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -28744,7 +30880,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_NEON",
@@ -28765,7 +30901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_NEON",
@@ -28789,7 +30925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -28813,7 +30949,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_NEON",
@@ -28837,7 +30973,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -28852,7 +30988,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -28870,7 +31006,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_NEON",
@@ -28888,7 +31024,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -28915,7 +31051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_NEON",
@@ -28933,7 +31069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -28951,7 +31087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_NEON",
@@ -28969,7 +31105,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposePlane",
@@ -28996,7 +31180,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_Any_NEON",
@@ -29026,7 +31210,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -29056,7 +31240,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_NEON",
@@ -29086,7 +31270,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -29119,7 +31303,31 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_NEON",
@@ -29143,7 +31351,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -29167,7 +31375,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_NEON",
@@ -29191,7 +31399,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -29218,7 +31453,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -29257,7 +31492,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -29296,7 +31531,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -29335,7 +31570,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -29374,7 +31609,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -29413,7 +31648,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -29452,7 +31687,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -29491,7 +31726,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -29530,7 +31765,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -29569,7 +31804,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -29608,7 +31843,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -29647,7 +31882,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -29686,7 +31921,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -29725,7 +31960,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -29764,7 +31999,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -29791,7 +32026,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_NEON",
@@ -29812,7 +32047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -29833,7 +32068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_NEON",
@@ -29854,7 +32089,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -29893,7 +32128,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -29932,7 +32167,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -29965,7 +32200,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_NEON",
@@ -29986,7 +32221,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -30007,7 +32242,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_NEON",
@@ -30028,7 +32263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_NEON",
@@ -30052,7 +32287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -30076,7 +32311,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_NEON",
@@ -30100,7 +32335,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -30127,7 +32362,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_NEON",
@@ -30145,7 +32380,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -30163,7 +32398,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_NEON",
@@ -30181,7 +32416,43 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ValidateJpeg",
@@ -30196,7 +32467,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -30223,7 +32494,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_NEON",
@@ -30244,7 +32515,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -30265,7 +32536,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_NEON",
@@ -30286,7 +32557,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -30325,7 +32596,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -30364,7 +32635,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -30397,7 +32668,70 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_NEON",
@@ -30418,7 +32752,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -30439,7 +32773,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_NEON",
@@ -30460,7 +32794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_NEON",
@@ -30484,7 +32818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -30508,7 +32842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_NEON",
@@ -30532,7 +32866,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -30559,7 +32893,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_NEON",
@@ -30577,7 +32911,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -30595,7 +32929,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_NEON",
@@ -30613,7 +32947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -30627,7 +32961,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -30640,7 +32974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -30654,7 +32988,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -30667,7 +33001,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -30689,7 +33023,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -30714,7 +33048,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -30730,7 +33064,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -30743,7 +33077,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -30759,7 +33093,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -30775,7 +33109,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -30792,7 +33126,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -30808,7 +33142,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -30824,7 +33158,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -30840,7 +33174,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -30857,7 +33191,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -30871,7 +33205,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -30887,7 +33221,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -30903,7 +33237,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -30921,7 +33255,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -30934,7 +33268,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -30950,7 +33284,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -30963,7 +33297,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -30976,7 +33310,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -30995,7 +33329,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -31008,7 +33342,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -31021,7 +33355,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -31034,7 +33368,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -31047,7 +33381,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -31056,121 +33390,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -31183,7 +33517,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -31192,7 +33526,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -31201,7 +33535,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -31210,7 +33544,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -31219,7 +33553,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 8,
@@ -31228,7 +33562,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -31237,7 +33571,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -31246,7 +33580,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 8,
@@ -31255,7 +33589,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -31264,7 +33598,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 8,
@@ -31273,7 +33607,16 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "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"
   },
   {
    "alignment" : 8,
@@ -31282,7 +33625,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -31291,7 +33634,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -31300,7 +33643,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -31309,7 +33652,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -31318,7 +33661,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -31327,7 +33670,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -31336,7 +33679,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -31345,7 +33688,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -31354,7 +33697,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -31363,7 +33706,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 8,
@@ -31372,7 +33715,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -31381,7 +33724,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -31394,7 +33737,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 16,
@@ -31404,7 +33747,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 8,
@@ -31414,7 +33757,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -31424,7 +33767,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -31434,7 +33777,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -31444,7 +33787,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -31454,7 +33797,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -31464,7 +33807,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -31474,7 +33817,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -31484,7 +33827,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -31513,7 +33856,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 16,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -31591,7 +33934,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 96,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 16,
@@ -31612,7 +33955,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 8,
@@ -31633,7 +33976,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 16,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/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 17915e9..c37d7ee 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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2937,7 +2937,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "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" : -16777216,
+     "enum_field_value" : 4278190080,
      "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" : -1073741824,
+     "enum_field_value" : 3221225472,
      "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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "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 f901d93..e86f49f 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" : 0,
+     "enum_field_value" : 4294967296,
      "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" : 0,
+     "enum_field_value" : -281474976710656,
      "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 4e8fa1d..6d7b41a 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 3f95b13..361f894 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 709df67..5367938 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" : 0,
+     "enum_field_value" : 4294967296,
      "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" : 0,
+     "enum_field_value" : -281474976710656,
      "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 9955685..57cca99 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 98503a3..60ead84 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 1f58c7c..881e020 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 827aa92..5560014 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 9551dac..b788925 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 66b06bb..7e65fbc 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 75a5d1e..25beb12 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 ac239e0..470db12 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 639b86b..d2b324c 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 0a44f9c..8ea6dc9 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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3688,7 +3688,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "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" : -16777216,
+     "enum_field_value" : 4278190080,
      "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" : -1073741824,
+     "enum_field_value" : 3221225472,
      "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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "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 3917e92..8ebe280 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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -831,7 +831,32 @@
    "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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
+   "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",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -965,7 +990,7 @@
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3179,7 +3204,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3197,7 +3222,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3218,7 +3243,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -3302,7 +3327,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5020,7 +5045,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -5029,7 +5054,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5065,7 +5090,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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -5083,7 +5108,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -5119,7 +5144,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -5137,7 +5162,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -5182,7 +5207,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5191,7 +5216,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5200,7 +5225,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5245,7 +5270,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -5299,7 +5324,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -6388,7 +6413,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -7901,7 +7926,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -7941,7 +7966,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -9563,7 +9588,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9603,7 +9628,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9791,7 +9816,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -9841,7 +9866,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9851,7 +9876,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9861,7 +9886,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9871,7 +9896,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -10155,7 +10180,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -10192,7 +10217,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -10222,7 +10247,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -10284,7 +10309,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10361,7 +10386,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10433,7 +10458,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10449,7 +10474,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10497,7 +10522,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10539,7 +10564,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10576,7 +10601,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -10623,7 +10648,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -10670,7 +10695,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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -10824,7 +10849,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -10910,7 +10935,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -10931,7 +10956,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -10967,7 +10992,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -11119,7 +11144,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -11286,7 +11311,7 @@
    "referenced_type" : "_ZTI6dirent",
    "self_type" : "_ZTI6dirent",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 4,
@@ -11302,7 +11327,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -11323,7 +11348,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11380,7 +11405,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -11401,7 +11426,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -11488,7 +11513,7 @@
    "referenced_type" : "_ZTI8dirent64",
    "self_type" : "_ZTI8dirent64",
    "size" : 280,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/dirent.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/dirent.h"
   },
   {
    "alignment" : 1,
@@ -11570,7 +11595,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -11648,7 +11673,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -11714,7 +11739,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -11735,7 +11760,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -11751,7 +11776,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -11772,7 +11797,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -11854,7 +11879,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -11870,7 +11895,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -11900,7 +11925,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -11916,7 +11941,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -12236,7 +12261,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -12282,7 +12307,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -15082,7 +15107,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -15104,7 +15129,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -15126,7 +15151,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -16849,7 +16874,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -16858,7 +16883,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16873,7 +16898,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -16882,7 +16907,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16897,7 +16922,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -16906,7 +16931,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -16921,7 +16946,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -16930,7 +16955,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -37115,7 +37140,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -41679,7 +41704,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -41719,7 +41744,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -41729,7 +41754,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -41739,7 +41764,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -42535,7 +42560,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -42544,7 +42569,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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 900521b..1949b6e 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,6 +5946,12 @@
     },
     {
      "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/config.json b/34/64/arm_arm64/source-based/config.json
index 403b4cf..5da2c2b 100644
--- a/34/64/arm_arm64/source-based/config.json
+++ b/34/64/arm_arm64/source-based/config.json
@@ -1,4 +1,9 @@
 {
+  "global": {
+    "flags": {
+      "advice_only": true
+    }
+  },
   "libbinder": [
     {
       "target_version": "current",
diff --git a/34/64/arm_arm64/source-based/libRSCpuRef.so.lsdump b/34/64/arm_arm64/source-based/libRSCpuRef.so.lsdump
index ca27daa..ca92679 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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -610,7 +610,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -628,7 +628,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/android/dlext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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" : -2097153,
+     "enum_field_value" : 4292870143,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "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/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6105,7 +6105,32 @@
    "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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
+   "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",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6239,7 +6264,7 @@
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -9266,7 +9291,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9305,7 +9330,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9344,7 +9369,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -9728,7 +9753,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9746,7 +9771,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9779,7 +9804,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9794,7 +9819,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9812,7 +9837,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9830,7 +9855,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9857,7 +9882,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -9893,7 +9918,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9911,7 +9936,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9932,7 +9957,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9956,7 +9981,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9992,7 +10017,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10031,7 +10056,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10067,7 +10092,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10106,7 +10131,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10139,7 +10164,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10157,7 +10182,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10274,7 +10299,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10295,7 +10320,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11657,7 +11682,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -11675,7 +11700,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -21892,7 +21917,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -21910,7 +21935,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -21919,7 +21944,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -21928,7 +21953,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -21973,7 +21998,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -21991,7 +22016,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22063,7 +22088,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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -22072,7 +22097,7 @@
    "referenced_type" : "_ZTI19android_namespace_t",
    "self_type" : "_ZTIP19android_namespace_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -22081,7 +22106,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22090,7 +22115,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22108,7 +22133,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -22144,7 +22169,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -22162,7 +22187,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -22252,7 +22277,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -22270,7 +22295,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -22288,7 +22313,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -22450,7 +22475,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22459,7 +22484,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22468,7 +22493,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22477,7 +22502,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22486,7 +22511,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22495,7 +22520,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22504,7 +22529,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22522,7 +22547,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22531,7 +22556,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22540,7 +22565,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22549,7 +22574,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22558,7 +22583,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22567,7 +22592,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22576,7 +22601,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22585,7 +22610,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22594,7 +22619,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22603,7 +22628,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22666,7 +22691,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22675,7 +22700,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23143,7 +23168,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -23152,7 +23177,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -23233,7 +23258,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23278,7 +23303,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23287,7 +23312,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23314,7 +23339,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -23437,8 +23462,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.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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -23887,8 +23912,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.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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -26284,7 +26309,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -29893,7 +29918,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -29947,7 +29972,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -30208,7 +30233,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -30352,7 +30377,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -30424,7 +30449,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -30605,7 +30630,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -30673,7 +30698,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -30723,7 +30748,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -30733,7 +30758,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -30773,7 +30798,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -34386,7 +34411,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.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -34429,7 +34454,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34699,7 +34724,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34729,7 +34754,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -34927,7 +34952,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -34977,7 +35002,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -34987,7 +35012,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -34997,7 +35022,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35007,7 +35032,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -35423,7 +35448,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35616,7 +35641,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -35672,7 +35697,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -35725,7 +35750,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -35755,7 +35780,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35817,7 +35842,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -36057,7 +36082,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36191,7 +36216,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36232,7 +36257,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36248,7 +36273,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36383,7 +36408,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36527,7 +36552,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36543,7 +36568,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36610,7 +36635,7 @@
    "referenced_type" : "_ZTI17android_dlextinfo",
    "self_type" : "_ZTI17android_dlextinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/android/dlext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/android/dlext.h"
   },
   {
    "alignment" : 4,
@@ -36626,7 +36651,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -36831,7 +36856,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -36878,7 +36903,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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -36920,7 +36945,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -37057,7 +37082,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -37344,7 +37369,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 8,
@@ -37435,7 +37460,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -37521,7 +37546,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -37542,7 +37567,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -37578,7 +37603,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -37730,7 +37755,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -37877,7 +37902,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -37898,7 +37923,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -38122,7 +38147,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -38153,7 +38178,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 8,
@@ -38189,7 +38214,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -38210,7 +38235,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -38369,7 +38394,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -38468,7 +38493,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -38534,7 +38559,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -38555,7 +38580,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -38571,7 +38596,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -38653,7 +38678,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -38669,7 +38694,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -38699,7 +38724,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -38715,7 +38740,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -39035,7 +39060,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -39081,7 +39106,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -45325,7 +45350,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_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",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -45406,7 +45431,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_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",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -46181,7 +46206,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "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"
     },
     {
      "field_name" : "second",
@@ -46198,7 +46223,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_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",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -46208,7 +46233,7 @@
    [
     {
      "field_name" : "first",
-     "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"
+     "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"
     },
     {
      "field_name" : "second",
@@ -46225,7 +46250,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_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",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -49790,7 +49815,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -49812,7 +49837,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -49834,7 +49859,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -55344,7 +55369,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55353,7 +55378,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55368,7 +55393,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55377,7 +55402,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55392,7 +55417,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55401,7 +55426,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55416,7 +55441,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55425,7 +55450,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -126854,7 +126879,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -126863,7 +126888,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -126881,7 +126906,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
-   "name" : "std::__make_tuple_indices<2, 0>",
+   "name" : "std::__make_tuple_indices<2>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "size" : 1,
@@ -148529,7 +148554,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -148569,7 +148594,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -148579,7 +148604,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -148589,7 +148614,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -148692,7 +148717,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -148806,7 +148831,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -148920,7 +148945,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -149019,7 +149044,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -149838,7 +149863,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -149847,7 +149872,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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 8f8a281..4833f13 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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -6156,6 +6156,31 @@
    "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"
     },
@@ -6282,7 +6307,7 @@
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8284,7 +8309,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8302,7 +8327,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -8341,7 +8366,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10084,7 +10109,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -10482,7 +10507,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10506,7 +10531,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11193,7 +11218,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24217,7 +24242,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24370,7 +24395,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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -24406,7 +24431,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -24460,7 +24485,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -24487,7 +24512,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -24901,7 +24926,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24910,7 +24935,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -24928,7 +24953,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -25567,7 +25592,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -26338,8 +26363,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKN7android12renderscript4MeshE",
    "name" : "const android::renderscript::Mesh *",
-   "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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -29095,7 +29120,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -29230,7 +29255,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -29329,7 +29354,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -29529,7 +29554,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -31727,7 +31752,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -31927,7 +31952,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -31937,7 +31962,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -32165,7 +32190,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32175,7 +32200,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32185,7 +32210,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -32195,7 +32220,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   }
  ],
  "record_types" :
@@ -32313,7 +32338,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "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" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -32675,7 +32700,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 8,
@@ -32728,7 +32753,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -32758,7 +32783,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -32820,7 +32845,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -33060,7 +33085,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -33362,7 +33387,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33378,7 +33403,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33565,7 +33590,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -33628,7 +33653,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33766,7 +33791,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -33932,7 +33957,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -34067,7 +34092,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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -34459,7 +34484,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -34545,7 +34570,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -34597,7 +34622,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -34633,7 +34658,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -34857,7 +34882,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -34878,7 +34903,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -35047,7 +35072,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -35068,7 +35093,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -35295,7 +35320,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -35394,7 +35419,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -35460,7 +35485,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -35481,7 +35506,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -35665,7 +35690,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -35686,7 +35711,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -35768,7 +35793,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -35784,7 +35809,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -35830,7 +35855,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -35846,7 +35871,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36166,7 +36191,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -36212,7 +36237,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "access" : "protected",
@@ -43425,7 +43450,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -43447,7 +43472,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "access" : "protected",
@@ -43492,7 +43517,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -68415,7 +68440,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<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 020e0d8..59f2220 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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_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" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8468,6 +8468,31 @@
    "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"
     },
@@ -8594,7 +8619,7 @@
    "referenced_type" : "_ZTI7$REG_R0",
    "self_type" : "_ZTI7$REG_R0",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -8672,7 +8697,7 @@
    "referenced_type" : "_ZTI8$SHUT_RD",
    "self_type" : "_ZTI8$SHUT_RD",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h",
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -11630,7 +11655,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvS_jPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11648,7 +11673,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -11687,7 +11712,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "return_type" : "_ZTIPv",
    "self_type" : "_ZTIFPvjjPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -13754,7 +13779,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -13811,7 +13836,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKvE",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -31830,7 +31855,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.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "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" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -35853,7 +35878,7 @@
    "referenced_type" : "_ZTI10__locale_t",
    "self_type" : "_ZTIP10__locale_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -35898,7 +35923,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTIP11user_fpregs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36132,7 +36157,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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -36177,7 +36202,7 @@
    "referenced_type" : "_ZTI5iovec",
    "self_type" : "_ZTIP5iovec",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -36204,7 +36229,7 @@
    "referenced_type" : "_ZTI7__sFILE",
    "self_type" : "_ZTIP7__sFILE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdio.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdio.h"
   },
   {
    "alignment" : 4,
@@ -36240,7 +36265,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTIP8ucontext",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -36267,7 +36292,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTIP9user_regs",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -36375,7 +36400,7 @@
    "referenced_type" : "_ZTIFPvS_jPKvE",
    "self_type" : "_ZTIPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36384,7 +36409,7 @@
    "referenced_type" : "_ZTIFPvjPKvE",
    "self_type" : "_ZTIPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -36402,7 +36427,7 @@
    "referenced_type" : "_ZTIFPvjjPKvE",
    "self_type" : "_ZTIPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37185,7 +37210,7 @@
    "referenced_type" : "_ZTIFvPvE",
    "self_type" : "_ZTIPFvPvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -37212,7 +37237,7 @@
    "referenced_type" : "_ZTIFvPvPKvE",
    "self_type" : "_ZTIPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -37401,7 +37426,7 @@
    "referenced_type" : "_ZTIK2tm",
    "self_type" : "_ZTIPK2tm",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -37641,8 +37666,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.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",
+   "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",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -37884,8 +37909,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.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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37893,8 +37918,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.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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37902,8 +37927,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.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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -37911,8 +37936,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.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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -40776,7 +40801,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 4,
@@ -40848,7 +40873,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -45024,7 +45049,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIPPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/unistd.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/unistd.h"
   },
   {
    "alignment" : 4,
@@ -45168,7 +45193,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -45258,7 +45283,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -45379,7 +45404,7 @@
    "referenced_type" : "_ZTIA65_PKc",
    "self_type" : "_ZTIA65_KPKc",
    "size" : 260,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 1,
@@ -45529,7 +45554,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTIK2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -49507,7 +49532,7 @@
    "referenced_type" : "_ZTIPKv",
    "self_type" : "_ZTIKPKv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49867,7 +49892,7 @@
    "referenced_type" : "_ZTIPc",
    "self_type" : "_ZTIKPc",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49877,7 +49902,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIKPv",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/string.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/string.h"
   },
   {
    "alignment" : 4,
@@ -49957,7 +49982,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/signal.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/signal.h"
   },
   {
    "alignment" : 8,
@@ -50065,7 +50090,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50115,7 +50140,7 @@
    "referenced_type" : "_ZTIPFPvS_jPKvE",
    "self_type" : "_ZTIVPFPvS_jPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50125,7 +50150,7 @@
    "referenced_type" : "_ZTIPFPvjPKvE",
    "self_type" : "_ZTIVPFPvjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50135,7 +50160,7 @@
    "referenced_type" : "_ZTIPFPvjjPKvE",
    "self_type" : "_ZTIVPFPvjjPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50145,7 +50170,7 @@
    "referenced_type" : "_ZTIPFvPvPKvE",
    "self_type" : "_ZTIVPFvPvPKvE",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 4,
@@ -50664,7 +50689,7 @@
    "referenced_type" : "_ZTI10sigset64_t",
    "self_type" : "_ZTI10sigset64_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -51028,7 +51053,7 @@
    "referenced_type" : "_ZTI11sched_param",
    "self_type" : "_ZTI11sched_param",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 4,
@@ -51058,7 +51083,7 @@
    "referenced_type" : "_ZTI11sigaction64",
    "self_type" : "_ZTI11sigaction64",
    "size" : 20,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -51120,7 +51145,7 @@
    "referenced_type" : "_ZTI11user_fpregs",
    "self_type" : "_ZTI11user_fpregs",
    "size" : 116,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 8,
@@ -51360,7 +51385,7 @@
    "referenced_type" : "_ZTI12user_vfp_exc",
    "self_type" : "_ZTI12user_vfp_exc",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -52153,7 +52178,7 @@
    "referenced_type" : "_ZTI14pthread_attr_t",
    "self_type" : "_ZTI14pthread_attr_t",
    "size" : 24,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52169,7 +52194,7 @@
    "referenced_type" : "_ZTI14pthread_cond_t",
    "self_type" : "_ZTI14pthread_cond_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52397,7 +52422,7 @@
    "referenced_type" : "_ZTI15pthread_mutex_t",
    "self_type" : "_ZTI15pthread_mutex_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 8,
@@ -52751,7 +52776,7 @@
    "referenced_type" : "_ZTI16pthread_rwlock_t",
    "self_type" : "_ZTI16pthread_rwlock_t",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -52766,7 +52791,7 @@
    "referenced_type" : "_ZTI16sockaddr_storage",
    "self_type" : "_ZTI16sockaddr_storage",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -52977,7 +53002,7 @@
    "referenced_type" : "_ZTI17pthread_barrier_t",
    "self_type" : "_ZTI17pthread_barrier_t",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53292,7 +53317,7 @@
    "referenced_type" : "_ZTI18pthread_spinlock_t",
    "self_type" : "_ZTI18pthread_spinlock_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/pthread_types.h"
   },
   {
    "alignment" : 4,
@@ -53413,7 +53438,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.UpsideDownCake_arm_armv8-a_shared/gen/include/pthread.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/pthread.h"
   },
   {
    "alignment" : 4,
@@ -54041,7 +54066,7 @@
    "referenced_type" : "_ZTI2tm",
    "self_type" : "_ZTI2tm",
    "size" : 44,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/time.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/time.h"
   },
   {
    "alignment" : 4,
@@ -54153,7 +54178,7 @@
    "referenced_type" : "_ZTI4stat",
    "self_type" : "_ZTI4stat",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -54239,7 +54264,7 @@
    "referenced_type" : "_ZTI4user",
    "self_type" : "_ZTI4user",
    "size" : 296,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -54291,7 +54316,7 @@
    "referenced_type" : "_ZTI5div_t",
    "self_type" : "_ZTI5div_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -54327,7 +54352,7 @@
    "referenced_type" : "_ZTI5flock",
    "self_type" : "_ZTI5flock",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 4,
@@ -54479,7 +54504,7 @@
    "referenced_type" : "_ZTI5lconv",
    "self_type" : "_ZTI5lconv",
    "size" : 56,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/locale.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/locale.h"
   },
   {
    "alignment" : 8,
@@ -54636,7 +54661,7 @@
    "referenced_type" : "_ZTI5ucred",
    "self_type" : "_ZTI5ucred",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -54652,7 +54677,7 @@
    "referenced_type" : "_ZTI6fd_set",
    "self_type" : "_ZTI6fd_set",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/select.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/select.h"
   },
   {
    "alignment" : 4,
@@ -54673,7 +54698,7 @@
    "referenced_type" : "_ZTI6ldiv_t",
    "self_type" : "_ZTI6ldiv_t",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -54694,7 +54719,7 @@
    "referenced_type" : "_ZTI6linger",
    "self_type" : "_ZTI6linger",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -54740,7 +54765,7 @@
    "referenced_type" : "_ZTI6msghdr",
    "self_type" : "_ZTI6msghdr",
    "size" : 28,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -54990,7 +55015,7 @@
    "referenced_type" : "_ZTI6stat64",
    "self_type" : "_ZTI6stat64",
    "size" : 104,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/stat.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/stat.h"
   },
   {
    "alignment" : 4,
@@ -55021,7 +55046,7 @@
    "referenced_type" : "_ZTI7Dl_info",
    "self_type" : "_ZTI7Dl_info",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/dlfcn.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/dlfcn.h"
   },
   {
    "alignment" : 4,
@@ -55047,7 +55072,7 @@
    "referenced_type" : "_ZTI7cmsghdr",
    "self_type" : "_ZTI7cmsghdr",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 8,
@@ -55083,7 +55108,7 @@
    "referenced_type" : "_ZTI7flock64",
    "self_type" : "_ZTI7flock64",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/flock.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/flock.h"
   },
   {
    "alignment" : 8,
@@ -55104,7 +55129,7 @@
    "referenced_type" : "_ZTI7lldiv_t",
    "self_type" : "_ZTI7lldiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/stdlib.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/stdlib.h"
   },
   {
    "alignment" : 4,
@@ -55140,7 +55165,7 @@
    "referenced_type" : "_ZTI7mmsghdr",
    "self_type" : "_ZTI7mmsghdr",
    "size" : 32,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55382,7 +55407,7 @@
    "referenced_type" : "_ZTI8mallinfo",
    "self_type" : "_ZTI8mallinfo",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 8,
@@ -55481,7 +55506,7 @@
    "referenced_type" : "_ZTI8sockaddr",
    "self_type" : "_ZTI8sockaddr",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -55502,7 +55527,7 @@
    "referenced_type" : "_ZTI8timespec",
    "self_type" : "_ZTI8timespec",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/timespec.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/timespec.h"
   },
   {
    "alignment" : 4,
@@ -55568,7 +55593,7 @@
    "referenced_type" : "_ZTI8ucontext",
    "self_type" : "_ZTI8ucontext",
    "size" : 744,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 8,
@@ -55589,7 +55614,7 @@
    "referenced_type" : "_ZTI8user_vfp",
    "self_type" : "_ZTI8user_vfp",
    "size" : 264,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 1,
@@ -55677,7 +55702,7 @@
    "referenced_type" : "_ZTI9cpu_set_t",
    "self_type" : "_ZTI9cpu_set_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sched.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sched.h"
   },
   {
    "alignment" : 8,
@@ -55698,7 +55723,7 @@
    "referenced_type" : "_ZTI9imaxdiv_t",
    "self_type" : "_ZTI9imaxdiv_t",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/inttypes.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/inttypes.h"
   },
   {
    "alignment" : 4,
@@ -55780,7 +55805,7 @@
    "referenced_type" : "_ZTI9mallinfo2",
    "self_type" : "_ZTI9mallinfo2",
    "size" : 40,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/malloc.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/malloc.h"
   },
   {
    "alignment" : 1,
@@ -55796,7 +55821,7 @@
    "referenced_type" : "_ZTI9mbstate_t",
    "self_type" : "_ZTI9mbstate_t",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/mbstate_t.h"
   },
   {
    "alignment" : 4,
@@ -55826,7 +55851,7 @@
    "referenced_type" : "_ZTI9sigaction",
    "self_type" : "_ZTI9sigaction",
    "size" : 16,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -55842,7 +55867,7 @@
    "referenced_type" : "_ZTI9user_regs",
    "self_type" : "_ZTI9user_regs",
    "size" : 72,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -56162,7 +56187,7 @@
    "referenced_type" : "_ZTIN11sigaction64Ut_E",
    "self_type" : "_ZTIN11sigaction64Ut_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -56208,7 +56233,7 @@
    "referenced_type" : "_ZTIN11user_fpregs6fp_regE",
    "self_type" : "_ZTIN11user_fpregs6fp_regE",
    "size" : 12,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/user.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/user.h"
   },
   {
    "alignment" : 4,
@@ -56480,7 +56505,7 @@
    "referenced_type" : "_ZTIN16sockaddr_storageUt_E",
    "self_type" : "_ZTIN16sockaddr_storageUt_E",
    "size" : 128,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 2,
@@ -56502,7 +56527,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.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/socket.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/socket.h"
   },
   {
    "alignment" : 4,
@@ -68882,7 +68907,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_E",
    "self_type" : "_ZTIN8ucontextUt_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -68904,7 +68929,7 @@
    "referenced_type" : "_ZTIN8ucontextUt_Ut_E",
    "self_type" : "_ZTIN8ucontextUt_Ut_E",
    "size" : 8,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/sys/ucontext.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/sys/ucontext.h"
   },
   {
    "alignment" : 4,
@@ -68926,7 +68951,7 @@
    "referenced_type" : "_ZTIN9sigactionUt_E",
    "self_type" : "_ZTIN9sigactionUt_E",
    "size" : 4,
-   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.UpsideDownCake_arm_armv8-a_shared/gen/include/bits/signal_types.h"
+   "source_file" : "out/soong/.intermediates/bionic/libc/libc/android_vendor.34_arm_armv8-a_shared/gen/include/bits/signal_types.h"
   },
   {
    "alignment" : 4,
@@ -73430,7 +73455,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -73439,7 +73464,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73454,7 +73479,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -73463,7 +73488,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73478,7 +73503,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -73487,7 +73512,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -73502,7 +73527,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -73511,7 +73536,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -124947,7 +124972,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -138435,7 +138460,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -138578,7 +138603,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -146132,7 +146157,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.UpsideDownCake_arm_armv8-a_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_arm_armv8-a_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -155457,7 +155482,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -155497,7 +155522,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -155507,7 +155532,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -155517,7 +155542,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -156275,7 +156300,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -156284,7 +156309,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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 98fe0b7..a2f7260 100644
--- a/34/64/arm_arm64/source-based/libaudioutils.so.lsdump
+++ b/34/64/arm_arm64/source-based/libaudioutils.so.lsdump
@@ -1999,6 +1999,14 @@
   },
   {
    "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"
   },
   {
@@ -3190,7 +3198,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3428,119 +3436,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -2080374784,
+     "enum_field_value" : 2214592512,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : -2013265920,
+     "enum_field_value" : 2281701376,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : -2013265919,
+     "enum_field_value" : 2281701377,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : -1879048192,
+     "enum_field_value" : 2415919104,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : -1610612736,
+     "enum_field_value" : 2684354560,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3552,15 +3560,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4363,15 +4371,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -551550977,
+     "enum_field_value" : 3743416319,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4853,99 +4861,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : -2147483137,
+     "enum_field_value" : 2147484159,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : -2147482625,
+     "enum_field_value" : 2147484671,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : -2147481601,
+     "enum_field_value" : 2147485695,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : -2147479553,
+     "enum_field_value" : 2147487743,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : -2147475457,
+     "enum_field_value" : 2147491839,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : -2147467265,
+     "enum_field_value" : 2147500031,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : -2147450881,
+     "enum_field_value" : 2147516415,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : -2147418113,
+     "enum_field_value" : 2147549183,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : -2147352577,
+     "enum_field_value" : 2147614719,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : -2147221505,
+     "enum_field_value" : 2147745791,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : -2146959361,
+     "enum_field_value" : 2148007935,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : -2146435073,
+     "enum_field_value" : 2148532223,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : -2145386497,
+     "enum_field_value" : 2149580799,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : -2143289345,
+     "enum_field_value" : 2151677951,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : -2139095041,
+     "enum_field_value" : 2155872255,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : -2130706433,
+     "enum_field_value" : 2164260863,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4961,7 +4969,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5683,7 +5691,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5758,7 +5766,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5779,7 +5787,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -15166,7 +15174,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfjjjS1_S3_jN7android11audio_utils7details13FILTER_OPTIONEELj32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -16796,7 +16804,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 4,
@@ -16805,7 +16813,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 4,
@@ -16814,7 +16822,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "size" : 4,
@@ -16931,7 +16939,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 4,
@@ -21631,7 +21639,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x2_t, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x2_tfLb0EEE",
    "size" : 96,
@@ -21657,7 +21665,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float32x4x4_t, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI13float32x4x4_tfLb0EEE",
    "size" : 160,
@@ -21683,7 +21691,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<__attribute__((neon_vector_type(4))) float, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceI19__simd128_float32_tfLb0EEE",
    "size" : 64,
@@ -22021,7 +22029,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
    "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 41f9fe0..f2be966 100644
--- a/34/64/arm_arm64/source-based/libbase.so.lsdump
+++ b/34/64/arm_arm64/source-based/libbase.so.lsdump
@@ -1048,12 +1048,21 @@
    "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"
   },
   {
@@ -1890,7 +1899,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1941,7 +1950,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2697,7 +2706,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLj500ENSt3__19allocatorIcEEE4growEj",
    "parameters" :
    [
@@ -2731,7 +2740,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLj500ENSt3__19allocatorIwEEE4growEj",
    "parameters" :
    [
@@ -4738,6 +4747,23 @@
    "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" :
@@ -4756,6 +4782,22 @@
   },
   {
    "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" :
    [
@@ -4772,6 +4814,22 @@
   },
   {
    "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 d8c04ea..c7a638d 100644
--- a/34/64/arm_arm64/source-based/libbinder.so.lsdump
+++ b/34/64/arm_arm64/source-based/libbinder.so.lsdump
@@ -73,6 +73,15 @@
    "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]",
@@ -91,15 +100,6 @@
    "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,34 +1066,6 @@
    "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"
   },
   {
@@ -1865,214 +1837,6 @@
    "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"
   },
   {
@@ -2157,12 +1921,21 @@
    "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"
   },
   {
@@ -2328,22 +2101,6 @@
    "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_"
   },
   {
@@ -2359,22 +2116,6 @@
    "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"
   },
   {
@@ -2426,14 +2167,6 @@
    "name" : "_ZN7android6Parcel12restartWriteEj"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android6Parcel12writeAlignedIxEEiT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android6Parcel12writeAlignedIyEEiT_"
-  },
-  {
    "name" : "_ZN7android6Parcel12writeCStringEPKc"
   },
   {
@@ -2572,6 +2305,9 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
+   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
+  },
+  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2779,6 +2515,9 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
+   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
+  },
+  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3316,6 +3055,9 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
+   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
+  },
+  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3526,7 +3268,10 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE"
+  },
+  {
+   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3844,22 +3589,6 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
-  },
-  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -3989,6 +3718,9 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
+   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -4007,14 +3739,6 @@
    "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"
   },
   {
@@ -4198,198 +3922,6 @@
    "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"
   },
   {
@@ -4496,462 +4028,10 @@
   },
   {
    "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_"
   },
   {
@@ -4960,1329 +4040,9 @@
   },
   {
    "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"
   },
   {
@@ -6544,15 +4304,9 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
-   "name" : "_ZN7android16kEnableRecordingE"
-  },
-  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
-   "name" : "_ZN7android20kEnableRpcDevServersE"
-  },
-  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -6989,10 +4743,6 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android10PoolThreadE"
-  },
-  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -7020,10 +4770,6 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android15BpShellCallbackE"
-  },
-  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -7033,14 +4779,6 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android16BpResultReceiverE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
-  },
-  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -7104,14 +4842,6 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -7180,6 +4910,10 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android15RpcTransportRawE"
+  },
+  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -7203,6 +4937,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android18RpcTransportCtxRawE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -8737,7 +6475,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -8788,7 +6526,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -13175,104 +10913,6 @@
    "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" :
@@ -15758,849 +13398,6 @@
    "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" :
@@ -17122,6 +13919,23 @@
    "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" :
@@ -17140,6 +13954,22 @@
   },
   {
    "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" :
    [
@@ -17156,6 +13986,22 @@
   },
   {
    "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" :
    [
@@ -17804,114 +14650,6 @@
    "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" :
@@ -17984,114 +14722,6 @@
    "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" :
@@ -18372,48 +15002,6 @@
    "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" :
@@ -19159,6 +15747,19 @@
    "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" :
@@ -20266,6 +16867,12 @@
    "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" :
@@ -21060,6 +17667,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -21073,6 +17681,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -22873,7 +19482,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIb",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -23019,7 +19628,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE",
    "parameters" :
    [
     {
@@ -23027,7 +19636,23 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
+     "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",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android9RpcServerE"
+    },
+    {
+     "referenced_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24943,6 +21568,19 @@
    "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" :
@@ -25033,46 +21671,6 @@
    "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" :
@@ -26021,1062 +22619,6 @@
    "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" :
@@ -27907,10 +23449,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA20_KDs",
-   "name" : "const char16_t (&)[20]",
-   "referenced_type" : "_ZTIA20_KDs",
-   "self_type" : "_ZTIRA20_KDs",
+   "linker_set_key" : "_ZTIRA1_KDs",
+   "name" : "const char16_t (&)[1]",
+   "referenced_type" : "_ZTIA1_KDs",
+   "self_type" : "_ZTIRA1_KDs",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -28116,7 +23658,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.UpsideDownCake_arm_armv8-a_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_arm_armv8-a_static_afdo-libbinder_lto-thin/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"
@@ -28816,10 +24358,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
-   "name" : "const android::String16::StaticData<20> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
+   "name" : "const android::String16::StaticData<1> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -30828,8 +26370,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.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",
+   "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",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -33472,10 +29014,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILj20EEE",
-   "name" : "android::StaticString16<20> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILj20EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILj1EEE",
+   "name" : "android::StaticString16<1> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -34156,6 +29698,15 @@
   },
   {
    "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",
@@ -34786,10 +30337,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj20EEE",
-   "name" : "android::String16::StaticData<20> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILj20EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj1EEE",
+   "name" : "android::String16::StaticData<1> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -35622,6 +31173,16 @@
    "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",
@@ -35632,16 +31193,6 @@
    "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",
@@ -37890,11 +33441,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "name" : "const android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "name" : "const android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -38014,7 +33565,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 176,
+   "size" : 200,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -39415,6 +34966,46 @@
      "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",
@@ -50492,15 +46083,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILj20EEE",
-   "name" : "android::StaticString16<20>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILj1EEE",
+   "name" : "android::StaticString16<1>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "size" : 48,
+   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "size" : 12,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -53971,7 +49562,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "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"
+     "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"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -54021,6 +49612,34 @@
     {
      "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"
     },
     {
@@ -61503,6 +57122,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 408,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -63604,14 +59229,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA20_Ds"
+     "referenced_type" : "_ZTIA1_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "name" : "android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "name" : "android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -64053,7 +59678,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 576,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
     },
     {
      "access" : "private",
@@ -64063,26 +59688,32 @@
     },
     {
      "access" : "private",
-     "field_name" : "mSessions",
+     "field_name" : "mServerSocketModifier",
      "field_offset" : 960,
+     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSessions",
+     "field_offset" : 1152,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 1056,
+     "field_offset" : 1248,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 1088,
+     "field_offset" : 1280,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 1152,
+     "field_offset" : 1344,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -64091,12 +59722,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 176,
+   "size" : 200,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 168,
+     "component_value" : 192,
      "kind" : "vbase_offset"
     },
     {
@@ -64133,11 +59764,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -168,
+     "component_value" : -192,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -168,
+     "component_value" : -192,
      "kind" : "offset_to_top"
     },
     {
@@ -65284,10 +60915,10 @@
   },
   {
    "alignment" : 4,
-   "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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -65320,6 +60951,15 @@
   },
   {
    "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 3f3f12f..1bae4a3 100644
--- a/34/64/arm_arm64/source-based/libc++.so.lsdump
+++ b/34/64/arm_arm64/source-based/libc++.so.lsdump
@@ -2596,14 +2596,6 @@
    "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_"
   },
   {
@@ -3766,10 +3758,6 @@
    "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"
   },
   {
@@ -4410,34 +4398,10 @@
   },
   {
    "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_"
   },
   {
@@ -4453,22 +4417,6 @@
    "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"
   },
   {
@@ -4644,10 +4592,6 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcj"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv"
-  },
-  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -5036,34 +4980,10 @@
   },
   {
    "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_"
   },
   {
@@ -5080,50 +5000,10 @@
   },
   {
    "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_"
   },
   {
@@ -5140,22 +5020,6 @@
   },
   {
    "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_"
   },
   {
@@ -9938,7 +9802,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_grouping",
+   "function_name" : "std::moneypunct<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9952,7 +9816,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9966,7 +9830,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9980,7 +9844,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -9994,7 +9858,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10008,7 +9872,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10022,7 +9886,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10036,7 +9900,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10050,7 +9914,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10190,7 +10054,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10204,7 +10068,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10218,7 +10082,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10232,7 +10096,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10246,7 +10110,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10260,7 +10124,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10274,7 +10138,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10288,7 +10152,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10302,7 +10166,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13221,7 +13085,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13235,7 +13099,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13249,7 +13113,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13263,7 +13127,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13277,7 +13141,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13291,7 +13155,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13305,7 +13169,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13319,7 +13183,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13333,7 +13197,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13473,7 +13337,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13487,7 +13351,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13501,7 +13365,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13515,7 +13379,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13529,7 +13393,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13543,7 +13407,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13557,7 +13421,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13571,7 +13435,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13585,7 +13449,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20316,50 +20180,6 @@
    "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" :
@@ -25790,25 +25610,6 @@
    "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" :
@@ -28559,7 +28360,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char, false>::init",
+   "function_name" : "std::moneypunct_byname<char>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28593,7 +28394,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28627,121 +28428,6 @@
   },
   {
    "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" :
    [
@@ -28765,29 +28451,6 @@
   },
   {
    "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" :
    [
@@ -28879,98 +28542,6 @@
    ]
   },
   {
-   "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",
@@ -29782,19 +29353,6 @@
    "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" :
@@ -31835,136 +31393,6 @@
   },
   {
    "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" :
    [
@@ -31991,32 +31419,6 @@
   },
   {
    "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" :
    [
@@ -32120,255 +31522,6 @@
    ]
   },
   {
-   "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" :
@@ -32399,35 +31552,6 @@
   },
   {
    "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" :
    [
@@ -32543,122 +31667,6 @@
    ]
   },
   {
-   "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" :
@@ -35555,13 +34563,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char, false>::id",
+   "name" : "std::moneypunct<char>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char, false>::intl",
+   "name" : "std::moneypunct<char>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -35579,13 +34587,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t, false>::id",
+   "name" : "std::moneypunct<wchar_t>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t, false>::intl",
+   "name" : "std::moneypunct<wchar_t>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -55133,7 +54141,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55142,7 +54150,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55157,7 +54165,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55166,7 +54174,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55181,7 +54189,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55190,7 +54198,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55205,7 +54213,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55214,7 +54222,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -115259,7 +114267,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -115268,7 +114276,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -135523,7 +134531,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -135533,7 +134541,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
-   "name" : "std::ratio<1000000, 1>",
+   "name" : "std::ratio<1000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
@@ -135573,7 +134581,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -135583,7 +134591,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -135593,7 +134601,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -136705,7 +135713,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<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,
@@ -136714,7 +135722,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<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,
@@ -136723,7 +135731,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<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,
@@ -136737,7 +135745,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -136746,7 +135754,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<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,
@@ -136783,7 +135791,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__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,
@@ -136792,7 +135800,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__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,
@@ -136829,7 +135837,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__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,
@@ -136838,7 +135846,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__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,
@@ -136875,7 +135883,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__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,
@@ -136884,7 +135892,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__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,
@@ -136921,7 +135929,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__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,
@@ -136930,7 +135938,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__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,
@@ -136967,7 +135975,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -136976,7 +135984,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -137045,7 +136053,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -137054,7 +136062,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -137169,7 +136177,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -137178,7 +136186,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<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 31579a5..97b70a7 100644
--- a/34/64/arm_arm64/source-based/libcap.so.lsdump
+++ b/34/64/arm_arm64/source-based/libcap.so.lsdump
@@ -50,9 +50,6 @@
  "elf_functions" :
  [
   {
-   "name" : "_libcap_strdup"
-  },
-  {
    "name" : "cap_clear"
   },
   {
@@ -80,6 +77,9 @@
    "name" : "cap_fill"
   },
   {
+   "name" : "cap_fill_flag"
+  },
+  {
    "name" : "cap_free"
   },
   {
@@ -122,12 +122,21 @@
    "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"
   },
   {
@@ -185,6 +194,9 @@
    "name" : "cap_prctlw"
   },
   {
+   "name" : "cap_proc_root"
+  },
+  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -522,6 +534,27 @@
    "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" :
@@ -684,6 +717,33 @@
    "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" :
@@ -717,6 +777,18 @@
    "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",
@@ -824,7 +896,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -839,7 +911,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -869,7 +941,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -890,7 +962,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -905,7 +977,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -999,6 +1071,18 @@
    "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 90236a9..3c7778b 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1269,7 +1269,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "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/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/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" : -16,
+     "enum_field_value" : 18446744073709551600,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3619,7 +3619,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3977,7 +3977,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "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" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4281,11 +4281,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6757,7 +6757,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7450,7 +7450,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7792,7 +7792,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7801,7 +7801,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -8226,7 +8226,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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 3bd3cdc..ab31292 100644
--- a/34/64/arm_arm64/source-based/libcrypto.so.lsdump
+++ b/34/64/arm_arm64/source-based/libcrypto.so.lsdump
@@ -38,15 +38,6 @@
    "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]",
@@ -120,11 +111,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -613,6 +604,9 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
+   "name" : "ASN1_TIME_set_string_X509"
+  },
+  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1864,18 +1858,6 @@
    "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"
   },
   {
@@ -2626,6 +2608,18 @@
    "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"
   },
   {
@@ -3082,6 +3076,15 @@
    "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"
   },
   {
@@ -3517,6 +3520,9 @@
    "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"
   },
   {
@@ -3736,6 +3742,9 @@
    "name" : "EVP_sha256"
   },
   {
+   "name" : "EVP_sha256_final_with_secret_suffix"
+  },
+  {
    "name" : "EVP_sha384"
   },
   {
@@ -4183,6 +4192,69 @@
    "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"
   },
   {
@@ -4789,6 +4861,27 @@
    "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"
   },
   {
@@ -7378,36 +7471,9 @@
    "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"
   },
   {
@@ -7426,24 +7492,9 @@
    "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"
   },
   {
@@ -8508,23 +8559,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8888,6 +8939,30 @@
      "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"
     },
     {
@@ -10388,6 +10463,21 @@
    "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" :
@@ -16277,6 +16367,21 @@
    "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" :
@@ -17336,6 +17441,135 @@
    "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" :
@@ -19220,6 +19454,12 @@
    "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",
@@ -20744,6 +20984,318 @@
    "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" :
@@ -27259,10 +27811,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27331,7 +27883,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29347,7 +29899,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30136,7 +30688,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31381,7 +31933,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31402,7 +31954,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -35756,114 +36308,6 @@
    "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" :
@@ -35876,48 +36320,6 @@
    "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",
@@ -35996,66 +36398,6 @@
    "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" :
@@ -36071,18 +36413,6 @@
    "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" :
@@ -36913,24 +37243,6 @@
   },
   {
    "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",
@@ -37048,6 +37360,15 @@
   },
   {
    "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",
@@ -37939,10 +38260,10 @@
   },
   {
    "alignment" : 4,
-   "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",
+   "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",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38094,6 +38415,15 @@
    "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,
@@ -38364,6 +38694,15 @@
    "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,
@@ -39145,12 +39484,21 @@
   },
   {
    "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/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
   {
    "alignment" : 4,
@@ -39352,15 +39700,6 @@
   },
   {
    "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",
@@ -39762,7 +40101,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
    "alignment" : 4,
@@ -39834,7 +40173,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/bio.h"
   },
   {
    "alignment" : 4,
@@ -39914,7 +40253,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 344,
+   "size" : 480,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40236,7 +40575,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 720,
+   "size" : 704,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40256,7 +40595,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 36,
+   "size" : 44,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40656,17 +40995,15 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 84,
+   "size" : 76,
    "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"
   },
   {
@@ -40788,12 +41125,22 @@
    "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/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
   {
    "alignment" : 8,
@@ -41046,6 +41393,42 @@
     {
      "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"
     },
     {
@@ -42195,7 +42578,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4736,
+     "field_offset" : 4608,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42203,7 +42586,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42231,22 +42614,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4928,
+     "field_offset" : 4800,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5120,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5632,
+     "field_offset" : 5504,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5696,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42254,7 +42637,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 720,
+   "size" : 704,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42547,7 +42930,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
+     "referenced_type" : "_ZTIA128_h"
     },
     {
      "field_name" : "block_used",
@@ -43077,7 +43460,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -43089,7 +43472,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 584,
+   "size" : 568,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43278,249 +43661,6 @@
    "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"
     },
@@ -43801,28 +43941,6 @@
    "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 ea0189e..a9ad8f0 100644
--- a/34/64/arm_arm64/source-based/libcrypto_utils.so.lsdump
+++ b/34/64/arm_arm64/source-based/libcrypto_utils.so.lsdump
@@ -137,13 +137,11 @@
  "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 7d0984d..9f96b7f 100644
--- a/34/64/arm_arm64/source-based/libcurl.so.lsdump
+++ b/34/64/arm_arm64/source-based/libcurl.so.lsdump
@@ -112,12 +112,6 @@
    "name" : "Curl_all_content_encodings"
   },
   {
-   "name" : "Curl_alpn_get_proxy_spec"
-  },
-  {
-   "name" : "Curl_alpn_get_spec"
-  },
-  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -208,9 +202,81 @@
    "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"
   },
   {
@@ -280,6 +346,9 @@
    "name" : "Curl_cf_def_send"
   },
   {
+   "name" : "Curl_cf_h1_proxy_insert_after"
+  },
+  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -292,6 +361,9 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
+   "name" : "Curl_cf_http_proxy_get_host"
+  },
+  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -367,15 +439,15 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard"
-  },
-  {
    "name" : "Curl_conn_cf_discard_all"
   },
   {
    "name" : "Curl_conn_cf_discard_chain"
   },
   {
+   "name" : "Curl_conn_cf_discard_sub"
+  },
+  {
    "name" : "Curl_conn_cf_get_select_socks"
   },
   {
@@ -385,6 +457,9 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
+   "name" : "Curl_conn_cf_is_ssl"
+  },
+  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -439,9 +514,6 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
-   "name" : "Curl_conn_http_proxy_add"
-  },
-  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -610,6 +682,72 @@
    "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"
   },
   {
@@ -682,6 +820,15 @@
    "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"
   },
   {
@@ -784,6 +931,9 @@
    "name" : "Curl_http_cookies"
   },
   {
+   "name" : "Curl_http_decode_status"
+  },
+  {
    "name" : "Curl_http_done"
   },
   {
@@ -811,6 +961,24 @@
    "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"
   },
   {
@@ -1486,6 +1654,9 @@
    "name" : "Curl_updatesocket"
   },
   {
+   "name" : "Curl_url_set_authority"
+  },
+  {
    "name" : "Curl_urldecode"
   },
   {
@@ -1849,6 +2020,9 @@
    "name" : "Curl_cfree"
   },
   {
+   "name" : "Curl_cft_h1_proxy"
+  },
+  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4256,6 +4430,10 @@
      "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
deleted file mode 100644
index d5b31cf..0000000
--- a/34/64/arm_arm64/source-based/libdiskconfig.so.lsdump
+++ /dev/null
@@ -1,642 +0,0 @@
-{
- "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 461a47f..8042217 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" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1553,7 +1553,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "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.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",
+   "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",
    "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.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",
+   "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",
    "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.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",
+   "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",
    "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 b5b80ef..b787134 100644
--- a/34/64/arm_arm64/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/arm_arm64/source-based/libdumpstateutil.so.lsdump
@@ -153,6 +153,9 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -202,6 +205,9 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -574,6 +580,12 @@
    "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",
@@ -712,6 +724,13 @@
   },
   {
    "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 6162eda..dc63f8b 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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "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 263dbf1..e7be079 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -975,7 +975,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -993,7 +993,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1070,7 +1070,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1129,7 +1129,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/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 5c06bee..9b7833d 100644
--- a/34/64/arm_arm64/source-based/libhidlbase.so.lsdump
+++ b/34/64/arm_arm64/source-based/libhidlbase.so.lsdump
@@ -264,14 +264,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -284,10 +276,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -300,10 +288,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -312,11 +296,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
   },
   {
    "binding" : "weak",
@@ -1890,22 +1874,6 @@
    "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"
   },
   {
@@ -1921,22 +1889,6 @@
    "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"
   },
   {
@@ -2398,26 +2350,6 @@
   },
   {
    "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"
   },
   {
@@ -2821,10 +2753,6 @@
   },
   {
    "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"
   },
   {
@@ -2841,10 +2769,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2905,10 +2829,6 @@
   },
   {
    "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_"
   },
   {
@@ -2917,10 +2837,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__18functionIFbbEEclEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__18functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS7_S7_S7_PNS_6vectorIPvNS_9allocatorIS9_EEEEEEclES5_S7_S7_S7_S7_SD_"
   },
   {
@@ -2929,14 +2845,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
   },
   {
@@ -2945,6 +2853,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -2957,18 +2869,10 @@
   },
   {
    "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_"
   },
   {
@@ -2985,14 +2889,6 @@
   },
   {
    "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"
   },
   {
@@ -3029,10 +2925,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -3077,6 +2969,10 @@
   },
   {
    "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_"
   },
   {
@@ -3093,10 +2989,6 @@
   },
   {
    "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"
   },
   {
@@ -3105,22 +2997,10 @@
   },
   {
    "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"
   },
   {
@@ -3129,14 +3009,6 @@
   },
   {
    "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_"
   },
   {
@@ -3145,30 +3017,14 @@
   },
   {
    "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"
   },
   {
@@ -3181,10 +3037,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseIPKcNS_9allocatorIS2_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIPvNS_9allocatorIS1_EEED2Ev"
   },
   {
@@ -3193,14 +3045,6 @@
   },
   {
    "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"
   },
   {
@@ -3253,7 +3097,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEEC2EjjS8_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3265,54 +3113,10 @@
   },
   {
    "binding" : "weak",
-   "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",
    "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEED2Ev"
   },
   {
    "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_"
   },
   {
@@ -3333,10 +3137,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3345,10 +3145,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3357,19 +3153,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3437,26 +3229,10 @@
   },
   {
    "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_"
   },
   {
@@ -3493,70 +3269,18 @@
   },
   {
    "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_"
   },
   {
@@ -3573,10 +3297,6 @@
   },
   {
    "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_"
   },
   {
@@ -3589,11 +3309,7 @@
   },
   {
    "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_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_"
+   "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",
@@ -3609,14 +3325,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_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_"
   },
   {
@@ -3637,19 +3345,15 @@
   },
   {
    "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_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEEiEEbEERKT_DpOT0_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -3665,14 +3369,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIRKS6_EEvOT_"
   },
   {
@@ -3685,10 +3381,6 @@
   },
   {
    "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_"
   },
   {
@@ -3697,18 +3389,6 @@
   },
   {
    "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"
   },
   {
@@ -3733,18 +3413,10 @@
   },
   {
    "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"
   },
   {
@@ -3785,22 +3457,10 @@
   },
   {
    "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_"
   },
   {
@@ -3809,14 +3469,6 @@
   },
   {
    "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"
   },
   {
@@ -3825,10 +3477,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -4117,10 +3765,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -4152,10 +3796,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -4241,10 +3881,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -4392,10 +4028,6 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
-  },
-  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4405,10 +4037,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4418,10 +4046,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4448,10 +4072,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8836,42 +8456,6 @@
    "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" :
@@ -8920,22 +8504,6 @@
    "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" :
@@ -8985,22 +8553,6 @@
   },
   {
    "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" :
    [
@@ -9033,22 +8585,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "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_8hardware27hidl_binder_death_recipientEEE"
-    },
-    {
-     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-    }
-   ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::IBinder>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
@@ -9065,6 +8601,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::wp<android::hardware::BHwBinder>::operator=",
    "linker_set_key" : "_ZN7android2wpINS_8hardware9BHwBinderEEaSERKS3_",
    "parameters" :
@@ -17395,118 +16947,6 @@
    "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" :
@@ -17597,118 +17037,6 @@
    "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" :
@@ -19723,91 +19051,6 @@
   },
   {
    "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" :
    [
@@ -22177,8 +21420,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.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",
+   "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",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -23528,7 +22771,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.UpsideDownCake_arm_armv8-a_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_arm_armv8-a_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/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 2a372d8..ae131fb 100644
--- a/34/64/arm_arm64/source-based/libmedia_helper.so.lsdump
+++ b/34/64/arm_arm64/source-based/libmedia_helper.so.lsdump
@@ -668,21 +668,33 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10valueHacOnE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
+   "name" : "_ZN7android14AudioParameter11valueHacOffE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
+   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -704,6 +716,15 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -713,6 +734,9 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
+   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1426,12 +1450,24 @@
    "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",
@@ -1444,6 +1480,12 @@
    "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",
@@ -1456,6 +1498,12 @@
    "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",
@@ -1498,6 +1546,24 @@
    "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",
@@ -1516,6 +1582,12 @@
    "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 fffef44..97779e6 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5549,7 +5549,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "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" : -268435456,
+     "enum_field_value" : 4026531840,
      "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/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/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" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -7273,6 +7273,10 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
+     "enum_field_value" : 10,
+     "name" : "android::ColorAspects::StandardDisplayP3"
+    },
+    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -7383,6 +7387,14 @@
      "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"
     }
@@ -10594,11 +10606,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -11185,11 +11197,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -11770,11 +11782,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12733,7 +12745,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12751,7 +12763,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12784,7 +12796,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12799,7 +12811,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12817,7 +12829,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12835,7 +12847,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12862,7 +12874,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12907,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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12925,7 +12937,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12946,7 +12958,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12970,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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13006,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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13045,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/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13081,7 +13093,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13120,7 +13132,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13153,7 +13165,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13171,7 +13183,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13207,7 +13219,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13228,7 +13240,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -16999,7 +17011,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17008,7 +17020,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17035,7 +17047,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17062,7 +17074,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17089,7 +17101,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17107,7 +17119,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17224,7 +17236,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17233,7 +17245,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17242,7 +17254,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17251,7 +17263,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17260,7 +17272,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17269,7 +17281,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17278,7 +17290,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17296,7 +17308,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17305,7 +17317,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17314,7 +17326,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17323,7 +17335,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17332,7 +17344,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17341,7 +17353,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17350,7 +17362,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17359,7 +17371,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17368,7 +17380,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17377,7 +17389,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17395,7 +17407,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17404,7 +17416,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17431,7 +17443,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17449,7 +17461,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -18875,6 +18887,15 @@
   },
   {
    "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",
@@ -18983,6 +19004,15 @@
   },
   {
    "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",
@@ -20329,7 +20359,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20356,7 +20386,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -20536,7 +20566,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20566,7 +20596,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22341,11 +22371,13 @@
    "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"
   },
   {
@@ -23153,7 +23185,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23209,7 +23241,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23394,7 +23426,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23538,7 +23570,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23831,7 +23863,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24213,7 +24245,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -35332,6 +35364,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 408,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -43436,6 +43474,15 @@
   },
   {
    "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 7587215..437b741 100644
--- a/34/64/arm_arm64/source-based/libprocessgroup.so.lsdump
+++ b/34/64/arm_arm64/source-based/libprocessgroup.so.lsdump
@@ -146,6 +146,12 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
+   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
+  },
+  {
+   "name" : "_Z24sendSignalToProcessGroupjii"
+  },
+  {
    "name" : "_Z24setProcessGroupSoftLimitjix"
   },
   {
@@ -244,7 +250,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1132,9 +1138,15 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1150,9 +1162,15 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1165,12 +1183,18 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1198,21 +1222,42 @@
    "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 4e71874..4282a1d 100644
--- a/34/64/arm_arm64/source-based/libsqlite.so.lsdump
+++ b/34/64/arm_arm64/source-based/libsqlite.so.lsdump
@@ -337,6 +337,9 @@
    "name" : "sqlite3_interrupt"
   },
   {
+   "name" : "sqlite3_is_interrupted"
+  },
+  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -691,6 +694,9 @@
    "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 68b05f4..ba49978 100644
--- a/34/64/arm_arm64/source-based/libssl.so.lsdump
+++ b/34/64/arm_arm64/source-based/libssl.so.lsdump
@@ -20,6 +20,15 @@
    "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]",
@@ -65,6 +74,15 @@
    "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]",
@@ -119,6 +137,15 @@
    "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]",
@@ -165,11 +192,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -200,6 +227,24 @@
    "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]",
@@ -512,6 +557,9 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
+   "name" : "SSL_CIPHER_get_handshake_digest"
+  },
+  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -536,9 +584,6 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
-   "name" : "SSL_CIPHER_get_value"
-  },
-  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -803,6 +848,9 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
+   "name" : "SSL_CTX_set1_group_ids"
+  },
+  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1364,6 +1412,24 @@
    "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"
   },
   {
@@ -1424,6 +1490,12 @@
    "name" : "SSL_get_finished"
   },
   {
+   "name" : "SSL_get_group_id"
+  },
+  {
+   "name" : "SSL_get_group_name"
+  },
+  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1445,6 +1517,9 @@
    "name" : "SSL_get_mode"
   },
   {
+   "name" : "SSL_get_negotiated_group"
+  },
+  {
    "name" : "SSL_get_options"
   },
   {
@@ -1715,6 +1790,9 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
+   "name" : "SSL_set1_group_ids"
+  },
+  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2093,6 +2171,9 @@
    "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"
   },
   {
@@ -6700,6 +6781,18 @@
    "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" :
@@ -6796,18 +6889,6 @@
    "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" :
@@ -7966,6 +8047,24 @@
    "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" :
@@ -10801,6 +10900,96 @@
    "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" :
@@ -11068,6 +11257,30 @@
    "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" :
@@ -11161,6 +11374,18 @@
    "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" :
@@ -12418,6 +12643,24 @@
    "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" :
@@ -14244,6 +14487,15 @@
   },
   {
    "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",
@@ -14271,6 +14523,15 @@
   },
   {
    "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",
@@ -14316,6 +14577,15 @@
   },
   {
    "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",
@@ -14325,6 +14595,15 @@
   },
   {
    "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",
@@ -14343,6 +14622,24 @@
   },
   {
    "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",
@@ -14370,6 +14667,24 @@
   },
   {
    "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",
@@ -14379,6 +14694,33 @@
   },
   {
    "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",
@@ -14532,6 +14874,15 @@
   },
   {
    "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",
@@ -14622,6 +14973,15 @@
   },
   {
    "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",
@@ -14742,15 +15102,6 @@
   },
   {
    "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",
@@ -14994,15 +15345,6 @@
   },
   {
    "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",
@@ -18225,6 +18567,15 @@
   },
   {
    "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",
@@ -18468,6 +18819,15 @@
   },
   {
    "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",
@@ -18477,6 +18837,15 @@
   },
   {
    "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",
@@ -18486,6 +18855,24 @@
   },
   {
    "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",
@@ -18531,6 +18918,15 @@
   },
   {
    "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",
@@ -19107,6 +19503,15 @@
   },
   {
    "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",
@@ -19116,6 +19521,24 @@
   },
   {
    "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",
@@ -19161,6 +19584,15 @@
   },
   {
    "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",
@@ -19323,15 +19755,6 @@
   },
   {
    "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",
@@ -19364,7 +19787,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
    "alignment" : 4,
@@ -19400,7 +19823,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 4,
@@ -19470,6 +19893,16 @@
    "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",
@@ -19500,6 +19933,16 @@
    "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",
@@ -19540,6 +19983,16 @@
    "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",
@@ -19570,6 +20023,26 @@
    "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",
@@ -19870,7 +20343,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20196,6 +20669,16 @@
    "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",
@@ -20368,13 +20851,11 @@
    "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"
   },
   {
@@ -20426,7 +20907,17 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 32,
+   "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,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20442,6 +20933,16 @@
   {
    "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",
@@ -20452,6 +20953,26 @@
   {
    "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",
@@ -20502,6 +21023,16 @@
   {
    "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",
@@ -20546,7 +21077,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" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22335,7 +22866,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4736,
+     "field_offset" : 4608,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22343,7 +22874,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22371,22 +22902,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4928,
+     "field_offset" : 4800,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5120,
+     "field_offset" : 4992,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5632,
+     "field_offset" : 5504,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5696,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22394,7 +22925,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 720,
+   "size" : 704,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23160,7 +23691,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -23172,7 +23703,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 584,
+   "size" : 568,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -23499,249 +24030,6 @@
    "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"
     },
@@ -24150,6 +24438,41 @@
    [
     {
      "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"
     }
    ],
@@ -24185,6 +24508,76 @@
    [
     {
      "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"
     }
    ],
@@ -24360,6 +24753,41 @@
    [
     {
      "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"
     }
    ],
@@ -26045,7 +26473,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" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26068,7 +26496,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" : 720,
+   "size" : 704,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26333,6 +26761,20 @@
   },
   {
    "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",
@@ -26347,6 +26789,34 @@
   },
   {
    "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 3e99ca8..95490f4 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" : 24,
+   "size" : 28,
    "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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6718,13 +6718,19 @@
      "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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6815,13 +6821,19 @@
      "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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9084,7 +9096,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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9103,7 +9115,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" : 24,
+   "size" : 28,
    "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 4739919..1e7b46a 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,6 +983,9 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
+   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy"
   },
   {
@@ -8092,6 +8095,10 @@
     },
     {
      "enum_field_value" : 10,
+     "name" : "android::ColorUtils::kColorStandardDisplay_P3"
+    },
+    {
+     "enum_field_value" : 10,
      "name" : "android::ColorUtils::kColorStandardDCI_P3"
     },
     {
@@ -8444,6 +8451,10 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
+     "enum_field_value" : 10,
+     "name" : "android::ColorAspects::StandardDisplayP3"
+    },
+    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -8554,6 +8565,14 @@
      "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"
     }
@@ -11682,11 +11701,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12273,11 +12292,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12858,11 +12877,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14455,6 +14474,37 @@
   },
   {
    "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 80f10ba..02b8ac6 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/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/e560d7b19ebf7276b3e850d3d346dec8/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/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/e560d7b19ebf7276b3e850d3d346dec8/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/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/e560d7b19ebf7276b3e850d3d346dec8/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 9e2c47c..e9fdab9 100644
--- a/34/64/arm_arm64/source-based/libstagefright_omx.so.lsdump
+++ b/34/64/arm_arm64/source-based/libstagefright_omx.so.lsdump
@@ -643,6 +643,9 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
+   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy"
   },
   {
@@ -8759,6 +8762,10 @@
     },
     {
      "enum_field_value" : 10,
+     "name" : "android::ColorUtils::kColorStandardDisplay_P3"
+    },
+    {
+     "enum_field_value" : 10,
      "name" : "android::ColorUtils::kColorStandardDCI_P3"
     },
     {
@@ -9111,6 +9118,10 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
+     "enum_field_value" : 10,
+     "name" : "android::ColorAspects::StandardDisplayP3"
+    },
+    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -9221,6 +9232,14 @@
      "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"
     }
@@ -15353,6 +15372,37 @@
   },
   {
    "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" :
    [
@@ -43232,6 +43282,15 @@
   },
   {
    "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 cc25fa3..c6dec2f 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,6 +7259,10 @@
      "name" : "android::ColorAspects::StandardFilm"
     },
     {
+     "enum_field_value" : 10,
+     "name" : "android::ColorAspects::StandardDisplayP3"
+    },
+    {
      "enum_field_value" : 255,
      "name" : "android::ColorAspects::StandardOther"
     }
@@ -7369,6 +7373,14 @@
      "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"
     }
@@ -9842,11 +9854,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24574,6 +24586,12 @@
     },
     {
      "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 af0870a..1480e65 100644
--- a/34/64/arm_arm64/source-based/libtinyalsa.so.lsdump
+++ b/34/64/arm_arm64/source-based/libtinyalsa.so.lsdump
@@ -219,6 +219,9 @@
    "name" : "pcm_get_subdevice"
   },
   {
+   "name" : "pcm_get_xruns"
+  },
+  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1299,6 +1302,18 @@
    "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 dca11b4..955d6e9 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/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -860,10 +860,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -872,18 +868,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1214,6 +1202,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1454,10 +1446,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common14ExtendableTypeEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common9DataspaceEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
   },
   {
@@ -1466,21 +1454,9 @@
   },
   {
    "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"
   },
   {
@@ -1508,10 +1484,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1528,10 +1500,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1551,10 +1519,6 @@
    "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"
   },
   {
@@ -2343,10 +2307,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_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_"
   },
   {
@@ -2375,10 +2335,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common14ExtendableTypeENS_9allocatorIS6_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEED2Ev"
   },
   {
@@ -2387,31 +2343,15 @@
   },
   {
    "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_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EjjS9_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lj4EEEEC2EjjS5_"
   },
   {
    "binding" : "weak",
@@ -2419,14 +2359,6 @@
   },
   {
    "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_"
   },
   {
@@ -2455,10 +2387,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLj128EEEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2507,30 +2435,14 @@
   },
   {
    "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_"
   },
   {
@@ -2543,26 +2455,10 @@
   },
   {
    "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_"
   },
   {
@@ -2571,15 +2467,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEj"
   },
   {
    "binding" : "weak",
@@ -2595,10 +2487,6 @@
   },
   {
    "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_"
   },
   {
@@ -2619,14 +2507,6 @@
   },
   {
    "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"
   },
   {
@@ -2635,10 +2515,6 @@
   },
   {
    "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_"
   },
   {
@@ -2647,14 +2523,6 @@
   },
   {
    "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"
   },
   {
@@ -2667,26 +2535,10 @@
   },
   {
    "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"
   },
   {
@@ -2695,18 +2547,6 @@
   },
   {
    "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"
   },
   {
@@ -4032,7 +3872,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -4048,11 +3888,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -4061,7 +3901,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4253,7 +4093,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4269,71 +4109,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4653,7 +4493,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4661,7 +4501,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7423,7 +7263,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8405,11 +8245,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8996,11 +8836,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9581,11 +9421,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10897,7 +10737,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10915,7 +10755,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10948,7 +10788,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10963,7 +10803,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10981,7 +10821,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10999,7 +10839,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11026,7 +10866,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11071,7 +10911,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11089,7 +10929,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11110,7 +10950,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11134,7 +10974,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11170,7 +11010,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11209,7 +11049,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11245,7 +11085,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11284,7 +11124,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11317,7 +11157,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11335,7 +11175,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11371,7 +11211,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11392,7 +11232,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14538,19 +14378,6 @@
    "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" :
@@ -14580,22 +14407,6 @@
    "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" :
@@ -14612,22 +14423,6 @@
    "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" :
@@ -16310,6 +16105,12 @@
    "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" :
@@ -22227,7 +22028,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22236,7 +22037,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22281,7 +22082,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22317,7 +22118,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22326,7 +22127,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22416,7 +22217,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22425,7 +22226,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22434,7 +22235,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22443,7 +22244,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22452,7 +22253,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22461,7 +22262,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22470,7 +22271,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22488,7 +22289,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22497,7 +22298,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22506,7 +22307,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22515,7 +22316,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22524,7 +22325,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22533,7 +22334,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22542,7 +22343,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22551,7 +22352,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22560,7 +22361,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22569,7 +22370,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22587,7 +22388,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22596,7 +22397,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22623,7 +22424,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22650,7 +22451,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25575,7 +25376,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25706,7 +25507,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25744,7 +25545,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28281,7 +28082,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28337,7 +28138,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28501,7 +28302,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28598,7 +28399,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28757,7 +28558,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28945,7 +28746,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/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 d0c1176..913d8c1 100644
--- a/34/64/arm_arm64/source-based/libunwindstack.so.lsdump
+++ b/34/64/arm_arm64/source-based/libunwindstack.so.lsdump
@@ -101,24 +101,6 @@
    "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]",
@@ -245,414 +227,381 @@
  "elf_functions" :
  [
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
+   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
+   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
   },
   {
-   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
   },
   {
-   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_GetGR"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
   },
   {
-   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_SetGR"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
   },
   {
-   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind13__Unwind_SetIP"
+   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvNtCsd9gH7jzOxdF_6unwind9libunwind17__Unwind_GetIPInfo"
+   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_GetGR"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
+   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_SetGR"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
+   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind13__Unwind_SetIP"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCsdc1qLhREGSP_6unwind9libunwind17__Unwind_GetIPInfo"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
+   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
+  },
+  {
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_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" : "_RNvXs7_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Cs3jb9llYclZH_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
+   "name" : "_RNvXs7_Csc3gp0nclRww_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
+   "name" : "_RNvXs7_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXsC_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
    "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE"
-  },
-  {
-   "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"
   },
   {
@@ -2541,45 +2490,6 @@
    "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"
   },
   {
@@ -3332,10 +3242,13 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
   },
   {
    "binding" : "weak",
@@ -3404,9 +3317,6 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
-   "name" : "_ZTVN11unwindstack10RegsMips64E"
-  },
-  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3598,9 +3508,6 @@
    "name" : "_ZTVN11unwindstack8RegsImplIyEE"
   },
   {
-   "name" : "_ZTVN11unwindstack8RegsMipsE"
-  },
-  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3664,6 +3571,9 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
+  },
+  {
+   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3835,48 +3745,6 @@
    "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" :
    [
@@ -4207,163 +4075,6 @@
    "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" :
    [
@@ -4389,14 +4100,6 @@
     },
     {
      "enum_field_value" : 5,
-     "name" : "unwindstack::ARCH_MIPS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "unwindstack::ARCH_MIPS64"
-    },
-    {
-     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4664,163 +4367,6 @@
    [
     {
      "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"
     },
     {
@@ -4926,194 +4472,6 @@
    "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" :
@@ -7845,194 +7203,6 @@
    "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",
@@ -8965,15 +8135,6 @@
   },
   {
    "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",
@@ -9334,15 +8495,6 @@
   },
   {
    "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",
@@ -9859,82 +9011,6 @@
      "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",
@@ -10252,12 +9328,6 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTINSt3__18iteratorINS_26bidirectional_iterator_tagEPN11unwindstack8DwarfFdeEiPS4_RS4_EE"
-    }
-   ],
    "fields" :
    [
     {
@@ -10664,32 +9734,6 @@
    "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" :
    [
@@ -11036,48 +10080,6 @@
      "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"
@@ -11471,68 +10473,6 @@
   },
   {
    "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" :
    [
     {
@@ -11935,22 +10875,6 @@
    "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"
     }
@@ -12113,103 +11037,6 @@
    "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"
     }
@@ -13793,82 +12620,6 @@
   },
   {
    "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 73ceb4e..f7476d5 100644
--- a/34/64/arm_arm64/source-based/libutils.so.lsdump
+++ b/34/64/arm_arm64/source-based/libutils.so.lsdump
@@ -493,10 +493,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -508,10 +504,6 @@
    "name" : "_ZN7android2spINS_6ThreadEE5clearEv"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_6ThreadEEaSEOS2_"
-  },
-  {
    "name" : "_ZN7android30get_report_sysprop_change_funcEv"
   },
   {
@@ -746,9 +738,6 @@
    "name" : "_ZN7android7String813appendFormatVEPKcSt9__va_list"
   },
   {
-   "name" : "_ZN7android7String816convertToResPathEv"
-  },
-  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1227,10 +1216,6 @@
   },
   {
    "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_"
   },
   {
@@ -1255,10 +1240,6 @@
   },
   {
    "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_"
   },
   {
@@ -1271,10 +1252,6 @@
   },
   {
    "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"
   },
   {
@@ -5764,19 +5741,6 @@
    "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" :
@@ -5822,22 +5786,6 @@
    "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" :
@@ -7068,19 +7016,6 @@
    "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 95087ca..e54cd23 100644
--- a/34/64/arm_arm64/source-based/libxml2.so.lsdump
+++ b/34/64/arm_arm64/source-based/libxml2.so.lsdump
@@ -719,6 +719,9 @@
    "name" : "xmlCtxtResetPush"
   },
   {
+   "name" : "xmlCtxtSetMaxAmplification"
+  },
+  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1403,6 +1406,9 @@
    "name" : "xmlMemShow"
   },
   {
+   "name" : "xmlMemSize"
+  },
+  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1916,6 +1922,9 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
+   "name" : "xmlParserInputBufferCreateString"
+  },
+  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3002,6 +3011,9 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
+   "name" : "xmlTextReaderSetMaxAmplification"
+  },
+  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5390,6 +5402,43 @@
    "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"
     },
@@ -5972,6 +6021,10 @@
      "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"
     },
@@ -9491,6 +9544,10 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -13971,6 +14028,21 @@
    "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" :
@@ -17220,6 +17292,18 @@
    "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" :
@@ -19743,6 +19827,18 @@
    "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" :
@@ -22619,7 +22715,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25407,6 +25503,21 @@
    "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" :
@@ -35290,13 +35401,18 @@
      "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" : 480,
+   "size" : 484,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -35980,7 +36096,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "standalone",
+     "field_name" : "flags",
      "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 ae873e6..95b97f0 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/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -131,12 +131,30 @@
    "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"
   },
   {
@@ -146,6 +164,15 @@
    "name" : "ABGRToUVRow_NEON"
   },
   {
+   "name" : "ABGRToYJRow_Any_NEON"
+  },
+  {
+   "name" : "ABGRToYJRow_C"
+  },
+  {
+   "name" : "ABGRToYJRow_NEON"
+  },
+  {
    "name" : "ABGRToYRow_Any_NEON"
   },
   {
@@ -545,6 +572,9 @@
    "name" : "ARGBToI420"
   },
   {
+   "name" : "ARGBToI420Alpha"
+  },
+  {
    "name" : "ARGBToI422"
   },
   {
@@ -851,6 +881,18 @@
    "name" : "DetilePlane"
   },
   {
+   "name" : "DetilePlane_16"
+  },
+  {
+   "name" : "DetileRow_16_Any_NEON"
+  },
+  {
+   "name" : "DetileRow_16_C"
+  },
+  {
+   "name" : "DetileRow_16_NEON"
+  },
+  {
    "name" : "DetileRow_Any_NEON"
   },
   {
@@ -872,6 +914,18 @@
    "name" : "DetileSplitUVRow_NEON"
   },
   {
+   "name" : "DetileToYUY2"
+  },
+  {
+   "name" : "DetileToYUY2_Any_NEON"
+  },
+  {
+   "name" : "DetileToYUY2_C"
+  },
+  {
+   "name" : "DetileToYUY2_NEON"
+  },
+  {
    "name" : "DivideRow_16_Any_NEON"
   },
   {
@@ -1016,6 +1070,9 @@
    "name" : "I010Copy"
   },
   {
+   "name" : "I010Rotate"
+  },
+  {
    "name" : "I010ToAB30"
   },
   {
@@ -1073,6 +1130,9 @@
    "name" : "I210Copy"
   },
   {
+   "name" : "I210Rotate"
+  },
+  {
    "name" : "I210ToAB30"
   },
   {
@@ -1124,6 +1184,9 @@
    "name" : "I212ToARGBRow_C"
   },
   {
+   "name" : "I212ToI420"
+  },
+  {
    "name" : "I212ToI422"
   },
   {
@@ -1166,6 +1229,12 @@
    "name" : "I410AlphaToARGBRow_C"
   },
   {
+   "name" : "I410Copy"
+  },
+  {
+   "name" : "I410Rotate"
+  },
+  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1181,9 +1250,15 @@
    "name" : "I410ToI010"
   },
   {
+   "name" : "I410ToI420"
+  },
+  {
    "name" : "I410ToI444"
   },
   {
+   "name" : "I412ToI420"
+  },
+  {
    "name" : "I412ToI444"
   },
   {
@@ -1292,6 +1367,9 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
+   "name" : "I420ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1406,6 +1484,18 @@
    "name" : "I422ToNV21"
   },
   {
+   "name" : "I422ToRAW"
+  },
+  {
+   "name" : "I422ToRGB24"
+  },
+  {
+   "name" : "I422ToRGB24Matrix"
+  },
+  {
+   "name" : "I422ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I422ToRGB24Row_Any_NEON"
   },
   {
@@ -1418,6 +1508,9 @@
    "name" : "I422ToRGB565"
   },
   {
+   "name" : "I422ToRGB565Matrix"
+  },
+  {
    "name" : "I422ToRGB565Row_Any_NEON"
   },
   {
@@ -1526,6 +1619,24 @@
    "name" : "I444ToNV21"
   },
   {
+   "name" : "I444ToRAW"
+  },
+  {
+   "name" : "I444ToRGB24"
+  },
+  {
+   "name" : "I444ToRGB24Matrix"
+  },
+  {
+   "name" : "I444ToRGB24Row_Any_NEON"
+  },
+  {
+   "name" : "I444ToRGB24Row_C"
+  },
+  {
+   "name" : "I444ToRGB24Row_NEON"
+  },
+  {
    "name" : "InitCpuFlags"
   },
   {
@@ -1616,6 +1727,12 @@
    "name" : "MM21ToNV12"
   },
   {
+   "name" : "MM21ToYUY2"
+  },
+  {
+   "name" : "MT2TToP010"
+  },
+  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -1646,12 +1763,6 @@
    "name" : "MergeARGBPlane"
   },
   {
-   "name" : "MergeARGBPlaneAlpha"
-  },
-  {
-   "name" : "MergeARGBPlaneOpaque"
-  },
-  {
    "name" : "MergeARGBRow_Any_NEON"
   },
   {
@@ -1745,6 +1856,9 @@
    "name" : "MirrorPlane"
   },
   {
+   "name" : "MirrorRow_16_C"
+  },
+  {
    "name" : "MirrorRow_Any_NEON"
   },
   {
@@ -1922,9 +2036,15 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
+   "name" : "P010ToI010"
+  },
+  {
    "name" : "P010ToP410"
   },
   {
+   "name" : "P012ToI012"
+  },
+  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2195,6 +2315,9 @@
    "name" : "RGBToYMatrixRow_NEON"
   },
   {
+   "name" : "RiscvCpuCaps"
+  },
+  {
    "name" : "RotatePlane"
   },
   {
@@ -2207,6 +2330,9 @@
    "name" : "RotatePlane90"
   },
   {
+   "name" : "RotatePlane_16"
+  },
+  {
    "name" : "Scale"
   },
   {
@@ -2348,6 +2474,9 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
+   "name" : "ScalePlaneDown2_16To8"
+  },
+  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -2381,6 +2510,12 @@
    "name" : "ScalePlane_16"
   },
   {
+   "name" : "ScaleRowDown2Box_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Box_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -2399,6 +2534,12 @@
    "name" : "ScaleRowDown2Box_Odd_NEON"
   },
   {
+   "name" : "ScaleRowDown2Linear_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -2411,6 +2552,12 @@
    "name" : "ScaleRowDown2Linear_NEON"
   },
   {
+   "name" : "ScaleRowDown2_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -2627,12 +2774,24 @@
    "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"
   },
   {
@@ -2747,12 +2906,6 @@
    "name" : "SplitARGBPlane"
   },
   {
-   "name" : "SplitARGBPlaneAlpha"
-  },
-  {
-   "name" : "SplitARGBPlaneOpaque"
-  },
-  {
    "name" : "SplitARGBRow_Any_NEON"
   },
   {
@@ -2843,9 +2996,21 @@
    "name" : "SwapUVRow_NEON"
   },
   {
+   "name" : "Transpose4x4_32_C"
+  },
+  {
+   "name" : "Transpose4x4_32_NEON"
+  },
+  {
    "name" : "TransposePlane"
   },
   {
+   "name" : "TransposePlane_16"
+  },
+  {
+   "name" : "TransposeUVWx8_16_C"
+  },
+  {
    "name" : "TransposeUVWx8_Any_NEON"
   },
   {
@@ -2858,6 +3023,9 @@
    "name" : "TransposeUVWxH_C"
   },
   {
+   "name" : "TransposeWx8_16_C"
+  },
+  {
    "name" : "TransposeWx8_Any_NEON"
   },
   {
@@ -2867,6 +3035,9 @@
    "name" : "TransposeWx8_NEON"
   },
   {
+   "name" : "TransposeWxH_16_C"
+  },
+  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -2969,6 +3140,12 @@
    "name" : "UYVYToYRow_NEON"
   },
   {
+   "name" : "UnpackMT2T_C"
+  },
+  {
+   "name" : "UnpackMT2T_NEON"
+  },
+  {
    "name" : "ValidateJpeg"
   },
   {
@@ -2996,6 +3173,15 @@
    "name" : "YUY2ToNV12"
   },
   {
+   "name" : "YUY2ToNVUVRow_Any_NEON"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_C"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_NEON"
+  },
+  {
    "name" : "YUY2ToUV422Row_Any_NEON"
   },
   {
@@ -3219,7 +3405,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3260,7 +3446,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3293,7 +3479,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3606,7 +3792,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -3855,7 +4041,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -3883,7 +4069,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -3907,7 +4093,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -3937,7 +4123,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_NEON",
@@ -3955,7 +4141,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -3973,7 +4159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_NEON",
@@ -3991,7 +4177,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4018,7 +4204,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -4036,7 +4222,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -4063,7 +4249,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -4102,7 +4288,112 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -4135,7 +4426,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -4168,7 +4459,79 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_NEON",
@@ -4192,7 +4555,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -4216,7 +4579,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_NEON",
@@ -4240,7 +4603,61 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_NEON",
@@ -4258,7 +4675,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -4276,7 +4693,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_NEON",
@@ -4294,7 +4711,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -4321,7 +4738,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -4339,7 +4756,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -4366,7 +4783,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -4384,7 +4801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -4411,7 +4828,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -4429,7 +4846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -4459,7 +4876,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -4480,7 +4897,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -4507,7 +4924,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -4534,7 +4951,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_NEON",
@@ -4552,7 +4969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -4570,7 +4987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_NEON",
@@ -4588,7 +5005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -4615,7 +5032,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_NEON",
@@ -4633,7 +5050,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -4651,7 +5068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_NEON",
@@ -4669,7 +5086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -4708,7 +5125,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_Any_NEON",
@@ -4732,7 +5149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -4756,7 +5173,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_NEON",
@@ -4780,7 +5197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_Any_NEON",
@@ -4798,7 +5215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -4816,7 +5233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_NEON",
@@ -4834,7 +5251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -4861,7 +5278,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_NEON",
@@ -4879,7 +5296,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -4897,7 +5314,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_NEON",
@@ -4915,7 +5332,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -4954,7 +5371,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_Any_NEON",
@@ -4978,7 +5395,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -5002,7 +5419,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_NEON",
@@ -5026,7 +5443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_Any_NEON",
@@ -5044,7 +5461,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -5062,7 +5479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_NEON",
@@ -5080,7 +5497,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -5113,7 +5530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_NEON",
@@ -5134,7 +5551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -5155,7 +5572,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_NEON",
@@ -5176,7 +5593,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -5200,7 +5617,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -5227,7 +5644,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_NEON",
@@ -5245,7 +5662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -5263,7 +5680,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_NEON",
@@ -5281,7 +5698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -5314,7 +5731,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -5335,7 +5752,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_NEON",
@@ -5356,7 +5773,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -5392,7 +5809,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -5422,7 +5839,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -5443,7 +5860,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_NEON",
@@ -5464,7 +5881,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -5494,7 +5911,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -5512,7 +5929,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -5539,7 +5956,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -5566,7 +5983,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -5593,7 +6010,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -5611,7 +6028,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -5638,7 +6055,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -5656,7 +6073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -5677,7 +6094,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -5704,7 +6121,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_NEON",
@@ -5722,7 +6139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -5740,7 +6157,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_NEON",
@@ -5758,7 +6175,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -5785,7 +6202,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -5803,7 +6220,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_NEON",
@@ -5821,7 +6238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -5848,7 +6265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -5884,7 +6301,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -5914,7 +6331,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -5938,7 +6355,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -5965,7 +6382,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_NEON",
@@ -5983,7 +6400,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -6001,7 +6418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_NEON",
@@ -6019,7 +6436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -6052,7 +6469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_NEON",
@@ -6073,7 +6490,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -6094,7 +6511,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_NEON",
@@ -6115,7 +6532,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -6145,7 +6562,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -6166,7 +6583,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -6202,7 +6619,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -6226,7 +6643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_NEON",
@@ -6250,7 +6667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -6280,7 +6697,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -6307,7 +6754,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -6322,7 +6769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_NEON",
@@ -6337,7 +6784,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_Any_NEON",
@@ -6355,7 +6802,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -6373,7 +6820,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_NEON",
@@ -6391,7 +6838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -6421,7 +6868,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -6442,7 +6889,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_NEON",
@@ -6463,7 +6910,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -6493,7 +6940,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_NEON",
@@ -6514,7 +6961,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -6535,7 +6982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_NEON",
@@ -6556,7 +7003,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -6583,7 +7030,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -6610,7 +7057,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -6637,7 +7084,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -6670,7 +7117,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_NEON",
@@ -6691,7 +7138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -6712,7 +7159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_NEON",
@@ -6733,7 +7180,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -6760,7 +7207,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_NEON",
@@ -6778,7 +7225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -6796,7 +7243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_NEON",
@@ -6814,7 +7261,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -6841,7 +7315,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -6859,7 +7333,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -6886,7 +7360,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_NEON",
@@ -6904,7 +7378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -6922,7 +7396,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_NEON",
@@ -6940,7 +7414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -6967,7 +7441,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_NEON",
@@ -6985,7 +7459,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -7003,7 +7477,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_NEON",
@@ -7021,7 +7495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -7048,7 +7522,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_NEON",
@@ -7066,7 +7540,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -7084,7 +7558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_NEON",
@@ -7102,7 +7576,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -7129,7 +7630,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -7168,7 +7669,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -7207,7 +7753,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -7246,7 +7792,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -7273,7 +7819,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -7312,7 +7858,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -7351,7 +7897,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -7384,7 +7930,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -7417,7 +7963,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -7444,7 +7990,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_NEON",
@@ -7462,7 +8008,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -7480,7 +8026,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_NEON",
@@ -7498,7 +8044,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -7525,7 +8071,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_NEON",
@@ -7543,7 +8089,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -7561,7 +8107,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_NEON",
@@ -7579,7 +8125,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -7606,7 +8152,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -7636,7 +8182,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_NEON",
@@ -7657,7 +8203,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -7671,14 +8217,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_NEON",
@@ -7692,14 +8238,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_NEON",
@@ -7717,7 +8263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -7735,7 +8281,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_NEON",
@@ -7753,7 +8299,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -7780,7 +8326,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_NEON",
@@ -7801,7 +8347,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -7822,7 +8368,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_NEON",
@@ -7843,7 +8389,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_NEON",
@@ -7867,7 +8413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -7891,7 +8437,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_NEON",
@@ -7915,7 +8461,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_NEON",
@@ -7939,7 +8485,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -7963,7 +8509,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_NEON",
@@ -7987,7 +8533,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -8014,7 +8560,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_NEON",
@@ -8032,7 +8578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -8050,7 +8596,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_NEON",
@@ -8068,7 +8614,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_NEON",
@@ -8086,7 +8632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -8104,7 +8650,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_NEON",
@@ -8122,7 +8668,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -8149,7 +8695,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -8176,7 +8722,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -8194,7 +8740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -8227,7 +8773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -8260,7 +8806,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_Any_NEON",
@@ -8281,7 +8827,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -8302,7 +8848,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_NEON",
@@ -8323,7 +8869,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_Any_NEON",
@@ -8344,7 +8890,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -8365,7 +8911,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_NEON",
@@ -8386,7 +8932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_Any_NEON",
@@ -8404,7 +8950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -8422,7 +8968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_NEON",
@@ -8440,7 +8986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -8482,7 +9028,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -8524,7 +9070,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -8569,7 +9115,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -8623,7 +9169,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -8680,7 +9226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -8692,7 +9238,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -8719,7 +9265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -8758,7 +9304,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_NEON",
@@ -8782,7 +9328,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -8806,7 +9352,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_NEON",
@@ -8830,7 +9376,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_NEON",
@@ -8848,7 +9394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -8866,7 +9412,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_NEON",
@@ -8884,7 +9430,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -8923,7 +9469,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -8947,7 +9493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -8968,7 +9514,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_Any_NEON",
@@ -8989,7 +9535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -9010,7 +9556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_NEON",
@@ -9031,7 +9577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -9058,7 +9604,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -9085,7 +9631,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -9097,7 +9643,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
+   "source_file" : "external/libyuv/include/libyuv/video_common.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -9118,7 +9664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -9136,7 +9682,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -9154,7 +9700,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -9181,7 +9727,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -9211,7 +9757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_NEON",
@@ -9232,7 +9778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -9253,7 +9799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_NEON",
@@ -9274,7 +9820,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -9304,7 +9850,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -9325,7 +9871,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -9367,7 +9913,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -9412,7 +9958,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -9469,7 +10015,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -9499,7 +10045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -9529,7 +10075,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -9556,7 +10102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -9583,7 +10129,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -9601,7 +10147,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_NEON",
@@ -9619,7 +10165,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -9637,7 +10183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_NEON",
@@ -9655,7 +10201,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -9673,7 +10219,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -9700,7 +10246,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -9729,8 +10275,101 @@
      "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/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::DetileRow_Any_NEON",
@@ -9751,7 +10390,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -9772,7 +10411,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_NEON",
@@ -9793,7 +10432,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -9829,7 +10468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_NEON",
@@ -9853,7 +10492,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -9877,7 +10516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_NEON",
@@ -9901,7 +10540,124 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_NEON",
@@ -9922,7 +10678,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -9943,7 +10699,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_NEON",
@@ -9964,7 +10720,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -9979,7 +10735,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -9994,7 +10750,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -10024,7 +10810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -10051,7 +10837,25 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -10069,13 +10873,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -10114,7 +10918,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -10153,7 +10957,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -10192,7 +10996,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -10231,7 +11035,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -10270,7 +11074,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -10309,7 +11113,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -10348,7 +11152,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -10387,7 +11191,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -10426,7 +11230,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -10465,7 +11269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -10504,7 +11308,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -10543,7 +11347,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -10582,7 +11386,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -10621,7 +11425,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -10660,7 +11464,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -10699,7 +11503,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -10738,7 +11542,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -10777,7 +11581,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -10816,7 +11620,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_Any_NEON",
@@ -10837,7 +11641,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloat1Row_NEON",
@@ -10858,7 +11662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -10888,7 +11692,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_NEON",
@@ -10909,7 +11713,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -10930,7 +11734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_NEON",
@@ -10951,7 +11755,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -10984,7 +11788,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -11011,7 +11815,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_NEON",
@@ -11038,7 +11842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -11056,7 +11860,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_NEON",
@@ -11074,7 +11878,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -11092,7 +11896,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -11110,7 +11914,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -11161,7 +11965,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -11215,7 +12019,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -11266,7 +12070,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -11305,7 +12163,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -11344,7 +12202,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -11383,7 +12241,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -11425,7 +12283,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -11470,7 +12328,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -11509,7 +12367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -11551,7 +12409,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -11596,7 +12454,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -11647,7 +12505,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -11698,7 +12556,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -11743,7 +12601,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -11785,7 +12643,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -11827,7 +12685,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -11878,7 +12736,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -11923,7 +12781,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -11974,7 +12832,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -12028,7 +12886,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -12058,7 +12916,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -12109,7 +12967,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -12148,7 +13060,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -12187,7 +13099,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -12226,7 +13138,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -12268,7 +13180,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -12313,7 +13225,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -12340,7 +13252,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -12379,7 +13291,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -12421,7 +13333,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -12466,7 +13378,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -12493,7 +13405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -12544,7 +13456,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -12595,7 +13507,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -12646,7 +13558,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -12697,7 +13609,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -12742,7 +13654,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -12769,7 +13681,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -12796,7 +13708,58 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -12847,7 +13810,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -12892,7 +13855,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -12919,7 +13882,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -12946,7 +13909,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -12973,7 +13936,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -13003,7 +13966,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_NEON",
@@ -13024,7 +13987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -13045,7 +14008,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_NEON",
@@ -13066,7 +14029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -13093,7 +14056,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -13132,7 +14095,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -13165,7 +14128,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -13216,7 +14179,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -13246,7 +14209,112 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -13288,7 +14356,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -13315,7 +14383,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -13357,7 +14425,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -13384,7 +14452,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -13435,7 +14503,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -13486,7 +14605,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -13537,7 +14707,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -13585,7 +14755,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -13633,7 +14803,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -13684,7 +14854,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -13738,7 +14908,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -13813,7 +14983,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -13864,7 +15034,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -13936,7 +15106,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -13987,7 +15157,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -14038,7 +15208,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -14086,7 +15256,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -14140,7 +15310,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -14200,7 +15370,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -14260,7 +15430,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -14320,7 +15490,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -14371,7 +15541,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -14410,7 +15580,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -14449,7 +15619,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -14488,7 +15658,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -14530,7 +15700,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -14569,7 +15739,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -14608,7 +15778,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -14647,7 +15817,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -14689,7 +15859,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -14734,7 +15904,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -14773,7 +15943,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -14824,7 +15994,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -14875,7 +16045,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -14914,7 +16084,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -14965,7 +16135,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -15016,7 +16186,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -15061,7 +16231,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -15106,7 +16276,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -15145,7 +16315,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -15184,7 +16354,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -15226,7 +16396,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -15265,7 +16480,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -15307,7 +16522,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -15349,7 +16564,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -15388,7 +16603,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -15430,7 +16645,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -15469,7 +16684,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -15508,7 +16723,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -15556,7 +16771,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -15604,7 +16819,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -15655,7 +16870,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -15709,7 +16924,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_NEON",
@@ -15739,7 +16954,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -15769,7 +16984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_NEON",
@@ -15799,7 +17014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -15850,7 +17065,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -15904,7 +17119,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -15964,7 +17179,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -16024,7 +17239,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -16084,7 +17299,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -16123,7 +17338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -16150,7 +17365,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -16189,7 +17404,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_NEON",
@@ -16216,7 +17431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -16243,7 +17458,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_NEON",
@@ -16270,7 +17485,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_NEON",
@@ -16297,7 +17512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -16324,7 +17539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_NEON",
@@ -16351,7 +17566,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -16393,7 +17608,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -16438,7 +17653,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_NEON",
@@ -16465,7 +17680,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -16492,7 +17707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_NEON",
@@ -16519,7 +17734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -16558,7 +17773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -16609,7 +17824,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -16660,7 +17875,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -16711,7 +17926,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -16756,7 +17971,172 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_NEON",
@@ -16783,7 +18163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -16810,7 +18190,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_NEON",
@@ -16837,7 +18217,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -16876,7 +18256,49 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_NEON",
@@ -16903,7 +18325,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -16930,7 +18352,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_NEON",
@@ -16957,7 +18379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -16996,7 +18418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -17038,7 +18460,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_NEON",
@@ -17065,7 +18487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -17092,7 +18514,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_NEON",
@@ -17119,7 +18541,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -17158,7 +18580,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_NEON",
@@ -17182,7 +18604,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -17206,7 +18628,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_NEON",
@@ -17230,7 +18652,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -17269,7 +18691,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_NEON",
@@ -17293,7 +18715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -17317,7 +18739,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_NEON",
@@ -17341,7 +18763,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -17389,7 +18811,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -17437,7 +18859,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -17488,7 +18910,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_NEON",
@@ -17518,7 +18940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -17548,7 +18970,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_NEON",
@@ -17578,7 +19000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -17629,7 +19051,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -17683,7 +19105,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -17743,7 +19165,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -17803,7 +19225,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -17863,7 +19285,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -17902,7 +19324,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -17941,7 +19363,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -17983,7 +19405,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_NEON",
@@ -18010,7 +19432,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -18037,7 +19459,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_NEON",
@@ -18064,7 +19486,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -18115,7 +19537,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -18160,7 +19582,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -18205,13 +19627,214 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -18247,7 +19870,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -18283,7 +19906,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -18310,7 +19933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_Any_NEON",
@@ -18334,7 +19957,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -18358,7 +19981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_NEON",
@@ -18382,7 +20005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_NEON",
@@ -18406,7 +20029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -18430,7 +20053,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_NEON",
@@ -18454,7 +20077,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -18481,7 +20104,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_NEON",
@@ -18499,7 +20122,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -18517,7 +20140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_NEON",
@@ -18535,7 +20158,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -18574,7 +20197,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -18613,7 +20236,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -18652,7 +20275,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -18691,7 +20314,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -18730,7 +20353,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -18769,7 +20392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -18808,7 +20431,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -18847,7 +20470,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -18886,7 +20509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -18907,7 +20530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -18940,7 +20563,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -18985,7 +20608,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -19024,7 +20647,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -19063,7 +20686,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -19108,7 +20731,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -19147,7 +20770,79 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -19159,7 +20854,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -19207,7 +20902,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_NEON",
@@ -19237,7 +20932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -19267,7 +20962,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_NEON",
@@ -19297,7 +20992,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -19345,7 +21040,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_NEON",
@@ -19375,7 +21070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -19405,7 +21100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_NEON",
@@ -19435,7 +21130,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -19480,7 +21175,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_NEON",
@@ -19507,7 +21202,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -19534,7 +21229,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_NEON",
@@ -19561,7 +21256,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -19600,7 +21295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -19624,7 +21319,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_NEON",
@@ -19648,7 +21343,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -19681,7 +21376,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -19717,7 +21412,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_NEON",
@@ -19741,7 +21436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -19765,7 +21460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_NEON",
@@ -19789,7 +21484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_NEON",
@@ -19810,7 +21505,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -19831,7 +21526,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_NEON",
@@ -19852,7 +21547,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -19894,7 +21589,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_Any_NEON",
@@ -19921,7 +21616,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_10_NEON",
@@ -19948,7 +21643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_NEON",
@@ -19975,7 +21670,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -20002,7 +21697,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_NEON",
@@ -20029,7 +21724,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_NEON",
@@ -20056,7 +21751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -20083,7 +21778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_NEON",
@@ -20110,7 +21805,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_NEON",
@@ -20137,7 +21832,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -20164,7 +21859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_NEON",
@@ -20191,7 +21886,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_NEON",
@@ -20215,7 +21910,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -20239,7 +21934,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_NEON",
@@ -20263,7 +21958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -20275,7 +21970,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -20302,7 +21997,25 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_NEON",
@@ -20320,7 +22033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -20338,7 +22051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_NEON",
@@ -20356,7 +22069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -20377,7 +22090,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_NEON",
@@ -20398,7 +22111,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -20425,7 +22138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_NEON",
@@ -20443,7 +22156,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -20461,7 +22174,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_NEON",
@@ -20479,7 +22192,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_NEON",
@@ -20500,7 +22213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -20521,7 +22234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_NEON",
@@ -20542,7 +22255,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -20581,7 +22294,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -20620,7 +22333,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -20668,7 +22381,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -20701,7 +22414,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -20734,7 +22447,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -20770,7 +22483,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_NEON",
@@ -20794,7 +22507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -20818,7 +22531,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_NEON",
@@ -20842,7 +22555,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -20887,7 +22600,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -20935,7 +22648,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -20974,7 +22687,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -21007,7 +22720,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -21040,7 +22753,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -21076,7 +22789,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_NEON",
@@ -21100,7 +22813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -21124,7 +22837,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_NEON",
@@ -21148,7 +22861,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -21181,7 +22894,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -21217,7 +22930,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_NEON",
@@ -21241,7 +22954,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -21265,7 +22978,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_NEON",
@@ -21289,7 +23002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -21328,7 +23041,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -21367,7 +23080,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -21400,7 +23113,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -21433,7 +23146,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -21469,7 +23182,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_NEON",
@@ -21493,7 +23206,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -21517,7 +23230,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_NEON",
@@ -21541,7 +23254,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -21586,7 +23299,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -21625,7 +23338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -21658,7 +23371,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -21691,7 +23404,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -21727,7 +23440,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_NEON",
@@ -21751,7 +23464,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -21775,7 +23488,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_NEON",
@@ -21799,7 +23512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -21832,7 +23545,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_NEON",
@@ -21853,7 +23566,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -21874,7 +23587,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_NEON",
@@ -21895,7 +23608,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -21931,7 +23644,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -21970,7 +23683,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -22006,7 +23719,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -22045,7 +23758,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -22084,7 +23842,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -22120,7 +23923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -22159,7 +23962,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -22183,7 +23986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -22219,7 +24022,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -22258,7 +24061,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -22282,7 +24085,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -22321,7 +24124,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -22345,7 +24148,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -22369,7 +24172,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -22396,7 +24199,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_NEON",
@@ -22414,7 +24217,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -22432,7 +24235,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_NEON",
@@ -22450,7 +24253,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -22489,7 +24292,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -22516,7 +24319,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -22555,7 +24358,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -22588,7 +24391,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -22615,7 +24418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_NEON",
@@ -22633,7 +24436,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -22651,7 +24454,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_NEON",
@@ -22669,7 +24472,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -22696,7 +24499,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_NEON",
@@ -22714,7 +24517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -22732,7 +24535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_NEON",
@@ -22750,7 +24553,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_Any_NEON",
@@ -22774,7 +24577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -22798,7 +24601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_NEON",
@@ -22822,7 +24625,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_Any_NEON",
@@ -22846,7 +24649,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -22870,7 +24673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_NEON",
@@ -22894,7 +24697,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_NEON",
@@ -22912,7 +24715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -22930,7 +24733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_NEON",
@@ -22948,7 +24751,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_Any_NEON",
@@ -22966,7 +24769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -22984,7 +24787,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_NEON",
@@ -23002,7 +24805,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -23029,7 +24832,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_NEON",
@@ -23047,7 +24850,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -23065,7 +24868,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_NEON",
@@ -23083,7 +24886,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -23110,7 +24913,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_NEON",
@@ -23128,7 +24931,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -23146,7 +24949,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_NEON",
@@ -23164,7 +24967,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -23203,7 +25006,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -23230,7 +25033,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -23269,7 +25072,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_Any_NEON",
@@ -23293,7 +25096,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -23317,7 +25120,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_NEON",
@@ -23341,7 +25144,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_Any_NEON",
@@ -23365,7 +25168,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -23389,7 +25192,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_NEON",
@@ -23413,7 +25216,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_NEON",
@@ -23431,7 +25234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -23449,7 +25252,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_NEON",
@@ -23467,7 +25270,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_Any_NEON",
@@ -23485,7 +25288,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -23503,7 +25306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_NEON",
@@ -23521,7 +25324,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -23548,7 +25351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_NEON",
@@ -23566,7 +25369,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -23584,7 +25387,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_NEON",
@@ -23602,7 +25405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -23641,7 +25444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_Any_NEON",
@@ -23665,7 +25468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -23689,7 +25492,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_NEON",
@@ -23713,7 +25516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_Any_NEON",
@@ -23731,7 +25534,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -23749,7 +25552,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_NEON",
@@ -23767,7 +25570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -23794,7 +25597,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -23833,7 +25636,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -23860,7 +25663,31 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_NEON",
@@ -23884,7 +25711,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -23908,7 +25735,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_NEON",
@@ -23932,7 +25759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_NEON",
@@ -23950,7 +25777,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -23968,7 +25795,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_NEON",
@@ -23986,7 +25813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_NEON",
@@ -24004,7 +25831,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -24022,7 +25849,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_NEON",
@@ -24040,7 +25867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -24070,7 +25897,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -24100,7 +25927,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -24118,7 +25945,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -24154,7 +25981,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -24184,7 +26023,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -24211,7 +26050,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -24238,7 +26077,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -24265,7 +26104,37 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "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"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -24325,7 +26194,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -24349,7 +26218,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -24373,7 +26242,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_Any_NEON",
@@ -24397,7 +26266,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -24421,7 +26290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -24445,7 +26314,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_Any_NEON",
@@ -24469,7 +26338,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -24493,7 +26362,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_NEON",
@@ -24514,7 +26383,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -24535,7 +26404,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_NEON",
@@ -24556,7 +26425,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -24577,7 +26446,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_NEON",
@@ -24598,7 +26467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -24619,7 +26488,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_NEON",
@@ -24643,7 +26512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -24667,7 +26536,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_NEON",
@@ -24691,7 +26560,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -24715,7 +26584,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -24733,7 +26602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_NEON",
@@ -24751,7 +26620,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -24769,7 +26638,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -24793,7 +26662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -24817,7 +26686,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -24841,7 +26710,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -24865,7 +26734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -24889,7 +26758,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -24913,7 +26782,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -24937,7 +26806,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_Any_NEON",
@@ -24961,7 +26830,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -24985,7 +26854,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -25009,7 +26878,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -25030,7 +26899,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -25066,7 +26935,46 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -25111,7 +27019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -25156,7 +27064,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -25204,7 +27112,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -25240,7 +27148,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -25276,7 +27184,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -25297,7 +27253,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_NEON",
@@ -25318,7 +27274,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -25339,7 +27295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -25360,7 +27316,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_NEON",
@@ -25381,7 +27337,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -25402,7 +27406,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_NEON",
@@ -25423,7 +27427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -25444,7 +27448,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -25465,7 +27517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_NEON",
@@ -25486,7 +27538,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -25507,7 +27559,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -25528,7 +27580,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_NEON",
@@ -25549,7 +27601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -25570,7 +27622,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -25591,7 +27643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -25612,7 +27664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_NEON",
@@ -25633,7 +27685,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -25654,7 +27706,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_NEON",
@@ -25675,7 +27727,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -25696,7 +27748,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -25717,7 +27769,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -25738,7 +27790,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_NEON",
@@ -25759,7 +27811,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -25780,7 +27832,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -25801,7 +27853,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_NEON",
@@ -25822,7 +27874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -25843,7 +27895,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_NEON",
@@ -25864,7 +27916,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -25885,7 +27937,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -25906,7 +27958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_NEON",
@@ -25927,7 +27979,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -25948,7 +28000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -25969,7 +28021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_NEON",
@@ -25990,7 +28042,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -26011,7 +28063,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_NEON",
@@ -26035,7 +28087,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -26059,7 +28111,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_NEON",
@@ -26083,7 +28135,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -26107,7 +28159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -26131,7 +28183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_NEON",
@@ -26155,7 +28207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -26179,7 +28231,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_NEON",
@@ -26197,7 +28249,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -26215,7 +28267,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_NEON",
@@ -26233,7 +28285,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -26251,7 +28303,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -26269,7 +28321,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_NEON",
@@ -26287,7 +28339,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -26305,7 +28357,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -26326,7 +28378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -26362,7 +28414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -26383,7 +28435,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -26407,7 +28459,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -26431,7 +28483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -26455,7 +28507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -26479,7 +28531,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -26503,7 +28555,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_NEON",
@@ -26524,7 +28576,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -26545,7 +28597,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -26566,7 +28639,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -26587,7 +28681,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -26611,7 +28705,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_Any_NEON",
@@ -26635,7 +28729,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -26659,7 +28753,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -26683,7 +28777,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_NEON",
@@ -26707,7 +28801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -26731,7 +28825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -26755,7 +28849,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_NEON",
@@ -26779,7 +28873,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -26803,7 +28897,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -26821,7 +28915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_NEON",
@@ -26839,7 +28933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -26857,7 +28951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -26875,7 +28969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_NEON",
@@ -26893,7 +28987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -26911,7 +29005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -26935,7 +29029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_NEON",
@@ -26953,7 +29047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -26971,7 +29065,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_NEON",
@@ -26989,7 +29083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_NEON",
@@ -27010,7 +29104,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -27031,7 +29125,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_NEON",
@@ -27052,7 +29146,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_NEON",
@@ -27073,7 +29167,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -27094,7 +29188,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_NEON",
@@ -27115,7 +29209,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -27139,7 +29233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_NEON",
@@ -27163,7 +29257,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_NEON",
@@ -27184,7 +29278,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -27205,7 +29299,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_NEON",
@@ -27226,7 +29320,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -27247,7 +29341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_NEON",
@@ -27268,7 +29362,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -27313,7 +29407,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_NEON",
@@ -27340,7 +29434,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -27367,7 +29461,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_NEON",
@@ -27394,7 +29488,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -27433,7 +29527,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_NEON",
@@ -27457,7 +29551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -27481,7 +29575,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_NEON",
@@ -27505,7 +29599,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -27541,7 +29635,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -27574,7 +29668,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -27607,7 +29701,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -27640,7 +29734,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -27673,7 +29767,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -27706,7 +29800,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -27742,7 +29836,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_NEON",
@@ -27766,7 +29860,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -27790,7 +29884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_NEON",
@@ -27814,7 +29908,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_NEON",
@@ -27835,7 +29929,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -27856,7 +29950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_NEON",
@@ -27877,7 +29971,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_NEON",
@@ -27901,7 +29995,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -27925,7 +30019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_NEON",
@@ -27949,7 +30043,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -27964,7 +30058,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -27982,7 +30076,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_NEON",
@@ -28000,7 +30094,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -28027,7 +30121,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_NEON",
@@ -28045,7 +30139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -28063,7 +30157,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_NEON",
@@ -28081,7 +30175,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposePlane",
@@ -28108,7 +30250,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_Any_NEON",
@@ -28138,7 +30280,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -28168,7 +30310,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_NEON",
@@ -28198,7 +30340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -28231,7 +30373,31 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_NEON",
@@ -28255,7 +30421,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -28279,7 +30445,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_NEON",
@@ -28303,7 +30469,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -28330,7 +30523,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -28369,7 +30562,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -28408,7 +30601,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -28447,7 +30640,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -28486,7 +30679,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -28525,7 +30718,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -28564,7 +30757,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -28603,7 +30796,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -28642,7 +30835,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -28681,7 +30874,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -28720,7 +30913,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -28759,7 +30952,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -28798,7 +30991,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -28837,7 +31030,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -28876,7 +31069,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -28903,7 +31096,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_NEON",
@@ -28924,7 +31117,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -28945,7 +31138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_NEON",
@@ -28966,7 +31159,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -29005,7 +31198,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -29044,7 +31237,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -29077,7 +31270,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_NEON",
@@ -29098,7 +31291,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -29119,7 +31312,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_NEON",
@@ -29140,7 +31333,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_NEON",
@@ -29164,7 +31357,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -29188,7 +31381,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_NEON",
@@ -29212,7 +31405,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -29239,7 +31432,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_NEON",
@@ -29257,7 +31450,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -29275,7 +31468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_NEON",
@@ -29293,7 +31486,43 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ValidateJpeg",
@@ -29308,7 +31537,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -29335,7 +31564,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_NEON",
@@ -29356,7 +31585,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -29377,7 +31606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_NEON",
@@ -29398,7 +31627,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -29437,7 +31666,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -29476,7 +31705,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -29509,7 +31738,70 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_NEON",
@@ -29530,7 +31822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -29551,7 +31843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_NEON",
@@ -29572,7 +31864,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_NEON",
@@ -29596,7 +31888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -29620,7 +31912,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_NEON",
@@ -29644,7 +31936,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -29671,7 +31963,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_NEON",
@@ -29689,7 +31981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -29707,7 +31999,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_NEON",
@@ -29725,7 +32017,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -29739,7 +32031,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -29752,7 +32044,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -29766,7 +32058,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -29779,7 +32071,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -29801,7 +32093,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -29826,7 +32118,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -29842,7 +32134,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -29855,7 +32147,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -29871,7 +32163,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -29887,7 +32179,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -29904,7 +32196,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -29920,7 +32212,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -29936,7 +32228,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -29952,7 +32244,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -29969,7 +32261,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -29983,7 +32275,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -29999,7 +32291,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -30015,7 +32307,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -30033,7 +32325,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -30046,7 +32338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -30062,7 +32354,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -30075,7 +32367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -30088,7 +32380,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -30107,7 +32399,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -30120,7 +32412,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -30133,7 +32425,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -30146,7 +32438,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -30159,7 +32451,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -30168,121 +32460,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -30295,7 +32587,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30304,7 +32596,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30313,7 +32605,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -30322,7 +32614,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30331,7 +32623,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -30340,7 +32632,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30349,7 +32641,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -30358,7 +32650,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -30367,7 +32659,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -30376,7 +32668,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -30385,7 +32677,16 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "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"
   },
   {
    "alignment" : 4,
@@ -30394,7 +32695,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -30403,7 +32704,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30412,7 +32713,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30421,7 +32722,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30430,7 +32731,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30439,7 +32740,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30448,7 +32749,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -30457,7 +32758,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -30466,7 +32767,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30475,7 +32776,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -30484,7 +32785,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -30493,7 +32794,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -30506,7 +32807,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 16,
@@ -30516,7 +32817,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -30526,7 +32827,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -30536,7 +32837,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -30546,7 +32847,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -30556,7 +32857,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -30566,7 +32867,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -30576,7 +32877,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -30586,7 +32887,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -30596,7 +32897,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -30625,7 +32926,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 12,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -30703,7 +33004,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 56,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 16,
@@ -30724,7 +33025,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -30745,7 +33046,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/34/64/x86/source-based/android.hardware.audio.common@2.0.so.lsdump b/34/64/x86/source-based/android.hardware.audio.common@2.0.so.lsdump
index 2f66bb2..64469f7 100644
--- a/34/64/x86/source-based/android.hardware.audio.common@2.0.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.audio.common@2.0.so.lsdump
@@ -2667,7 +2667,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"
     },
     {
@@ -2807,119 +2807,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2936,7 +2936,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3084,7 +3084,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -3665,7 +3665,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -3889,39 +3889,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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/x86/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump b/34/64/x86/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
index a175cf4..4296c99 100644
--- a/34/64/x86/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
@@ -635,7 +635,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -643,7 +643,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump b/34/64/x86/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
index c2e730a..ec8f536 100644
--- a/34/64/x86/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
@@ -3690,11 +3690,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump b/34/64/x86/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
index a0f53a8..dba6120 100644
--- a/34/64/x86/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
@@ -3684,11 +3684,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -4275,11 +4275,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4860,11 +4860,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump b/34/64/x86/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
index a7ed66a..06ddcd0 100644
--- a/34/64/x86/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
@@ -562,7 +562,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -570,7 +570,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86/source-based/android.hardware.graphics.common@1.0.so.lsdump b/34/64/x86/source-based/android.hardware.graphics.common@1.0.so.lsdump
index 9a047be..4f69495 100644
--- a/34/64/x86/source-based/android.hardware.graphics.common@1.0.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.graphics.common@1.0.so.lsdump
@@ -2856,11 +2856,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86/source-based/android.hardware.graphics.common@1.1.so.lsdump b/34/64/x86/source-based/android.hardware.graphics.common@1.1.so.lsdump
index ebc16fb..7a827ca 100644
--- a/34/64/x86/source-based/android.hardware.graphics.common@1.1.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.graphics.common@1.1.so.lsdump
@@ -2856,11 +2856,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3447,11 +3447,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86/source-based/android.hardware.graphics.common@1.2.so.lsdump b/34/64/x86/source-based/android.hardware.graphics.common@1.2.so.lsdump
index 441ecba..7a13db9 100644
--- a/34/64/x86/source-based/android.hardware.graphics.common@1.2.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.graphics.common@1.2.so.lsdump
@@ -2873,11 +2873,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3464,11 +3464,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4049,11 +4049,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86/source-based/android.hardware.graphics.mapper@2.0.so.lsdump b/34/64/x86/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
index d847e0f..274d783 100644
--- a/34/64/x86/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
@@ -3230,11 +3230,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86/source-based/android.hardware.graphics.mapper@2.1.so.lsdump b/34/64/x86/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
index 96f7e6d..c0a2f08 100644
--- a/34/64/x86/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
@@ -3228,11 +3228,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3819,11 +3819,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86/source-based/android.hardware.graphics.mapper@3.0.so.lsdump b/34/64/x86/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
index 508d1c8..e8146f3 100644
--- a/34/64/x86/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
@@ -3266,11 +3266,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3857,11 +3857,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4442,11 +4442,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86/source-based/android.hardware.graphics.mapper@4.0.so.lsdump b/34/64/x86/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
index 04cfa8b..1f47e56 100644
--- a/34/64/x86/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
@@ -3362,11 +3362,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3953,11 +3953,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4538,11 +4538,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86/source-based/android.hardware.media.omx@1.0.so.lsdump b/34/64/x86/source-based/android.hardware.media.omx@1.0.so.lsdump
index cc3453e..03b9919 100644
--- a/34/64/x86/source-based/android.hardware.media.omx@1.0.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.media.omx@1.0.so.lsdump
@@ -5060,11 +5060,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86/source-based/android.hardware.media@1.0.so.lsdump b/34/64/x86/source-based/android.hardware.media@1.0.so.lsdump
index 2e11995..dd8eb56 100644
--- a/34/64/x86/source-based/android.hardware.media@1.0.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.media@1.0.so.lsdump
@@ -2864,11 +2864,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86/source-based/android.hardware.soundtrigger@2.0.so.lsdump b/34/64/x86/source-based/android.hardware.soundtrigger@2.0.so.lsdump
index da8c2d2..328ef87 100644
--- a/34/64/x86/source-based/android.hardware.soundtrigger@2.0.so.lsdump
+++ b/34/64/x86/source-based/android.hardware.soundtrigger@2.0.so.lsdump
@@ -3418,7 +3418,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"
     },
     {
@@ -3558,119 +3558,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3687,7 +3687,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3835,7 +3835,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -4416,7 +4416,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -4640,39 +4640,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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/x86/source-based/android.hidl.memory@1.0-impl.so.lsdump b/34/64/x86/source-based/android.hidl.memory@1.0-impl.so.lsdump
index 369083a..0c8700d 100644
--- a/34/64/x86/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/34/64/x86/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -963,6 +963,31 @@
    "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_x86_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -17903,7 +17928,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -17912,7 +17937,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -17927,7 +17952,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -17936,7 +17961,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -17951,7 +17976,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -17960,7 +17985,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -17975,7 +18000,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -17984,7 +18009,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -38187,7 +38212,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -42751,7 +42776,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -42791,7 +42816,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -42801,7 +42826,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -42811,7 +42836,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -43607,7 +43632,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -43616,7 +43641,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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/x86/source-based/android.hidl.token@1.0-utils.so.lsdump b/34/64/x86/source-based/android.hidl.token@1.0-utils.so.lsdump
index 6a8925a..527ce30 100644
--- a/34/64/x86/source-based/android.hidl.token@1.0-utils.so.lsdump
+++ b/34/64/x86/source-based/android.hidl.token@1.0-utils.so.lsdump
@@ -5945,6 +5945,12 @@
     },
     {
      "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/x86/source-based/config.json b/34/64/x86/source-based/config.json
index 403b4cf..5da2c2b 100644
--- a/34/64/x86/source-based/config.json
+++ b/34/64/x86/source-based/config.json
@@ -1,4 +1,9 @@
 {
+  "global": {
+    "flags": {
+      "advice_only": true
+    }
+  },
   "libbinder": [
     {
       "target_version": "current",
diff --git a/34/64/x86/source-based/libRSCpuRef.so.lsdump b/34/64/x86/source-based/libRSCpuRef.so.lsdump
index 9fa7018..852f3e3 100644
--- a/34/64/x86/source-based/libRSCpuRef.so.lsdump
+++ b/34/64/x86/source-based/libRSCpuRef.so.lsdump
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -313,7 +313,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -655,7 +655,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -673,7 +673,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -691,7 +691,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7174,7 +7174,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -7190,11 +7190,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -7203,7 +7203,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7456,6 +7456,31 @@
    "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_x86_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -11087,7 +11112,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11105,7 +11130,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11138,7 +11163,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11153,7 +11178,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11171,7 +11196,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11189,7 +11214,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11216,7 +11241,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11252,7 +11277,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11270,7 +11295,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11291,7 +11316,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11315,7 +11340,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11351,7 +11376,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11390,7 +11415,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11426,7 +11451,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11465,7 +11490,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11498,7 +11523,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11516,7 +11541,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11633,7 +11658,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11654,7 +11679,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23756,7 +23781,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23765,7 +23790,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23819,7 +23844,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23837,7 +23862,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23945,7 +23970,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23954,7 +23979,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24305,7 +24330,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24314,7 +24339,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24323,7 +24348,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24332,7 +24357,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24341,7 +24366,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24350,7 +24375,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24359,7 +24384,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24377,7 +24402,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24386,7 +24411,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24395,7 +24420,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24404,7 +24429,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24413,7 +24438,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24422,7 +24447,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24431,7 +24456,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24440,7 +24465,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24449,7 +24474,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24458,7 +24483,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24521,7 +24546,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24530,7 +24555,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -25088,7 +25113,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25133,7 +25158,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -25142,7 +25167,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25292,8 +25317,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_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -25742,8 +25767,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_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -31739,7 +31764,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -31793,7 +31818,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -32509,7 +32534,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -32559,7 +32584,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -32569,7 +32594,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36212,7 +36237,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_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -37709,7 +37734,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -37765,7 +37790,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -38616,7 +38641,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -38952,7 +38977,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -39492,7 +39517,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -39705,7 +39730,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -48066,7 +48091,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48147,7 +48172,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -48922,7 +48947,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -48939,7 +48964,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48949,7 +48974,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -48966,7 +48991,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -58085,7 +58110,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -58094,7 +58119,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -58109,7 +58134,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -58118,7 +58143,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -58133,7 +58158,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -58142,7 +58167,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -58157,7 +58182,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -58166,7 +58191,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -129573,7 +129598,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -129582,7 +129607,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -129600,7 +129625,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
-   "name" : "std::__make_tuple_indices<2, 0>",
+   "name" : "std::__make_tuple_indices<2>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "size" : 1,
@@ -151227,7 +151252,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -151267,7 +151292,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -151277,7 +151302,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -151287,7 +151312,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -151390,7 +151415,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151504,7 +151529,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151618,7 +151643,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151717,7 +151742,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -152536,7 +152561,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -152545,7 +152570,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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/x86/source-based/libRSDriver.so.lsdump b/34/64/x86/source-based/libRSDriver.so.lsdump
index d2b55f2..0532556 100644
--- a/34/64/x86/source-based/libRSDriver.so.lsdump
+++ b/34/64/x86/source-based/libRSDriver.so.lsdump
@@ -5970,7 +5970,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5986,71 +5986,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -6262,6 +6262,31 @@
    "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_x86_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -10604,7 +10629,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10628,7 +10653,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11315,7 +11340,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -26478,8 +26503,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_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -32424,7 +32449,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -69459,7 +69484,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
diff --git a/34/64/x86/source-based/libRS_internal.so.lsdump b/34/64/x86/source-based/libRS_internal.so.lsdump
index 5b60c9c..c6334cf 100644
--- a/34/64/x86/source-based/libRS_internal.so.lsdump
+++ b/34/64/x86/source-based/libRS_internal.so.lsdump
@@ -8302,7 +8302,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -8318,71 +8318,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -8574,6 +8574,31 @@
    "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_x86_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -31952,7 +31977,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_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -37781,8 +37806,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_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -38024,8 +38049,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_x86_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38033,8 +38058,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_x86_shared/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38042,8 +38067,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_x86_shared/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38051,8 +38076,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_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -74466,7 +74491,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -74475,7 +74500,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74490,7 +74515,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -74499,7 +74524,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74514,7 +74539,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -74523,7 +74548,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74538,7 +74563,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -74547,7 +74572,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -126001,7 +126026,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -139489,7 +139514,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -139632,7 +139657,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147186,7 +147211,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -156511,7 +156536,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -156551,7 +156576,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -156561,7 +156586,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -156571,7 +156596,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -157329,7 +157354,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -157338,7 +157363,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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/x86/source-based/libaudioutils.so.lsdump b/34/64/x86/source-based/libaudioutils.so.lsdump
index b6cb435..e4788ee 100644
--- a/34/64/x86/source-based/libaudioutils.so.lsdump
+++ b/34/64/x86/source-based/libaudioutils.so.lsdump
@@ -1740,6 +1740,14 @@
   },
   {
    "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"
   },
   {
@@ -2927,7 +2935,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3165,119 +3173,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -2080374784,
+     "enum_field_value" : 2214592512,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : -2013265920,
+     "enum_field_value" : 2281701376,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : -2013265919,
+     "enum_field_value" : 2281701377,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : -1879048192,
+     "enum_field_value" : 2415919104,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : -1610612736,
+     "enum_field_value" : 2684354560,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3289,15 +3297,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4100,15 +4108,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -551550977,
+     "enum_field_value" : 3743416319,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4590,99 +4598,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : -2147483137,
+     "enum_field_value" : 2147484159,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : -2147482625,
+     "enum_field_value" : 2147484671,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : -2147481601,
+     "enum_field_value" : 2147485695,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : -2147479553,
+     "enum_field_value" : 2147487743,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : -2147475457,
+     "enum_field_value" : 2147491839,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : -2147467265,
+     "enum_field_value" : 2147500031,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : -2147450881,
+     "enum_field_value" : 2147516415,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : -2147418113,
+     "enum_field_value" : 2147549183,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : -2147352577,
+     "enum_field_value" : 2147614719,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : -2147221505,
+     "enum_field_value" : 2147745791,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : -2146959361,
+     "enum_field_value" : 2148007935,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : -2146435073,
+     "enum_field_value" : 2148532223,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : -2145386497,
+     "enum_field_value" : 2149580799,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : -2143289345,
+     "enum_field_value" : 2151677951,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : -2139095041,
+     "enum_field_value" : 2155872255,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : -2130706433,
+     "enum_field_value" : 2164260863,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4698,7 +4706,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5420,7 +5428,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5495,7 +5503,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5516,7 +5524,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -12212,7 +12220,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfjjjS1_S3_jN7android11audio_utils7details13FILTER_OPTIONEELj32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -13977,7 +13985,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 4,
@@ -19127,7 +19135,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 28,
diff --git a/34/64/x86/source-based/libbase.so.lsdump b/34/64/x86/source-based/libbase.so.lsdump
index 2029f6b..d6f7d7c 100644
--- a/34/64/x86/source-based/libbase.so.lsdump
+++ b/34/64/x86/source-based/libbase.so.lsdump
@@ -1074,12 +1074,21 @@
    "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"
   },
   {
@@ -1916,7 +1925,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1967,7 +1976,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2723,7 +2732,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLj500ENSt3__19allocatorIcEEE4growEj",
    "parameters" :
    [
@@ -2757,7 +2766,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLj500ENSt3__19allocatorIwEEE4growEj",
    "parameters" :
    [
@@ -4906,6 +4915,23 @@
    "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" :
@@ -4924,6 +4950,22 @@
   },
   {
    "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" :
    [
@@ -4940,6 +4982,22 @@
   },
   {
    "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/x86/source-based/libbinder.so.lsdump b/34/64/x86/source-based/libbinder.so.lsdump
index fd16726..8ed4729 100644
--- a/34/64/x86/source-based/libbinder.so.lsdump
+++ b/34/64/x86/source-based/libbinder.so.lsdump
@@ -73,6 +73,15 @@
    "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" : 4,
    "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]",
@@ -91,15 +100,6 @@
    "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" : 4,
    "linker_set_key" : "_ZTIA20_y",
    "name" : "unsigned long long[20]",
@@ -1064,34 +1064,6 @@
    "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"
   },
   {
@@ -1863,214 +1835,6 @@
    "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"
   },
   {
@@ -2155,12 +1919,21 @@
    "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"
   },
   {
@@ -2326,22 +2099,6 @@
    "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_"
   },
   {
@@ -2357,22 +2114,6 @@
    "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"
   },
   {
@@ -2424,14 +2165,6 @@
    "name" : "_ZN7android6Parcel12restartWriteEj"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android6Parcel12writeAlignedIxEEiT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android6Parcel12writeAlignedIyEEiT_"
-  },
-  {
    "name" : "_ZN7android6Parcel12writeCStringEPKc"
   },
   {
@@ -2570,6 +2303,9 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
+   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
+  },
+  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2777,6 +2513,9 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
+   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
+  },
+  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3314,6 +3053,9 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
+   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
+  },
+  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3524,7 +3266,10 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE"
+  },
+  {
+   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3842,22 +3587,6 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
-  },
-  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -3987,6 +3716,9 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
+   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -4005,14 +3737,6 @@
    "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"
   },
   {
@@ -4196,198 +3920,6 @@
    "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"
   },
   {
@@ -4494,406 +4026,10 @@
   },
   {
    "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_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_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_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_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_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_EEEC2EjjSA_"
-  },
-  {
-   "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_bufferIxRNS_9allocatorIxEEED2Ev"
-  },
-  {
-   "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_"
   },
   {
@@ -4902,1329 +4038,9 @@
   },
   {
    "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"
   },
   {
@@ -6486,15 +4302,9 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
-   "name" : "_ZN7android16kEnableRecordingE"
-  },
-  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
-   "name" : "_ZN7android20kEnableRpcDevServersE"
-  },
-  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -6931,10 +4741,6 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android10PoolThreadE"
-  },
-  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -6962,10 +4768,6 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android15BpShellCallbackE"
-  },
-  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -6975,14 +4777,6 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android16BpResultReceiverE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
-  },
-  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -7046,14 +4840,6 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -7122,6 +4908,10 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android15RpcTransportRawE"
+  },
+  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -7145,6 +4935,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android18RpcTransportCtxRawE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -8679,7 +6473,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -8730,7 +6524,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -13117,104 +10911,6 @@
    "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" :
@@ -15700,849 +13396,6 @@
    "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" :
@@ -17064,6 +13917,23 @@
    "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" :
@@ -17082,6 +13952,22 @@
   },
   {
    "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" :
    [
@@ -17098,6 +13984,22 @@
   },
   {
    "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" :
    [
@@ -17746,114 +14648,6 @@
    "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" :
@@ -17926,114 +14720,6 @@
    "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" :
@@ -18314,48 +15000,6 @@
    "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" :
@@ -19101,6 +15745,19 @@
    "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" :
@@ -20208,6 +16865,12 @@
    "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" :
@@ -21002,6 +17665,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -21015,6 +17679,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -22815,7 +19480,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIb",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -22961,7 +19626,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE",
    "parameters" :
    [
     {
@@ -22969,7 +19634,23 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
+     "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",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android9RpcServerE"
+    },
+    {
+     "referenced_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24885,6 +21566,19 @@
    "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" :
@@ -24975,46 +21669,6 @@
    "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" :
@@ -25963,1062 +22617,6 @@
    "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" :
@@ -27849,10 +23447,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA20_KDs",
-   "name" : "const char16_t (&)[20]",
-   "referenced_type" : "_ZTIA20_KDs",
-   "self_type" : "_ZTIRA20_KDs",
+   "linker_set_key" : "_ZTIRA1_KDs",
+   "name" : "const char16_t (&)[1]",
+   "referenced_type" : "_ZTIA1_KDs",
+   "self_type" : "_ZTIRA1_KDs",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -28058,7 +23656,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_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_static_afdo-libbinder_lto-thin/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"
@@ -28758,10 +24356,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
-   "name" : "const android::String16::StaticData<20> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
+   "name" : "const android::String16::StaticData<1> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -30770,8 +26368,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_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_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_x86_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -33414,10 +29012,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILj20EEE",
-   "name" : "android::StaticString16<20> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILj20EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILj1EEE",
+   "name" : "android::StaticString16<1> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -34098,6 +29696,15 @@
   },
   {
    "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",
@@ -34728,10 +30335,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj20EEE",
-   "name" : "android::String16::StaticData<20> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILj20EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj1EEE",
+   "name" : "android::String16::StaticData<1> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -35564,6 +31171,16 @@
    "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",
@@ -35574,16 +31191,6 @@
    "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" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIA20_Ky",
@@ -37832,11 +33439,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "name" : "const android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "name" : "const android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -37956,7 +33563,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 176,
+   "size" : 200,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -39357,6 +34964,46 @@
      "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",
@@ -50434,15 +46081,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILj20EEE",
-   "name" : "android::StaticString16<20>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILj1EEE",
+   "name" : "android::StaticString16<1>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "size" : 48,
+   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "size" : 12,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -53913,7 +49560,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.34_x86_shared/obj/frameworks/native/libs/binder/Binder.sdump"
+     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.34_x86_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/native/libs/binder/Binder.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -53963,6 +49610,34 @@
     {
      "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"
     },
     {
@@ -61445,6 +57120,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 408,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -63546,14 +59227,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA20_Ds"
+     "referenced_type" : "_ZTIA1_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "name" : "android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "name" : "android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -63995,7 +59676,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 576,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
     },
     {
      "access" : "private",
@@ -64005,26 +59686,32 @@
     },
     {
      "access" : "private",
-     "field_name" : "mSessions",
+     "field_name" : "mServerSocketModifier",
      "field_offset" : 960,
+     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSessions",
+     "field_offset" : 1152,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 1056,
+     "field_offset" : 1248,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 1088,
+     "field_offset" : 1280,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 1152,
+     "field_offset" : 1344,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -64033,12 +59720,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 176,
+   "size" : 200,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 168,
+     "component_value" : 192,
      "kind" : "vbase_offset"
     },
     {
@@ -64075,11 +59762,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -168,
+     "component_value" : -192,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -168,
+     "component_value" : -192,
      "kind" : "offset_to_top"
     },
     {
@@ -65226,10 +60913,10 @@
   },
   {
    "alignment" : 4,
-   "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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -65262,6 +60949,15 @@
   },
   {
    "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/x86/source-based/libc++.so.lsdump b/34/64/x86/source-based/libc++.so.lsdump
index dcc4a65..19ea3cb 100644
--- a/34/64/x86/source-based/libc++.so.lsdump
+++ b/34/64/x86/source-based/libc++.so.lsdump
@@ -2594,14 +2594,6 @@
    "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_"
   },
   {
@@ -4404,34 +4396,10 @@
   },
   {
    "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_"
   },
   {
@@ -4447,22 +4415,6 @@
    "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"
   },
   {
@@ -4638,10 +4590,6 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcj"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv"
-  },
-  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -5030,34 +4978,10 @@
   },
   {
    "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_"
   },
   {
@@ -5074,50 +4998,10 @@
   },
   {
    "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_"
   },
   {
@@ -5134,22 +5018,6 @@
   },
   {
    "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_"
   },
   {
@@ -9926,7 +9794,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_grouping",
+   "function_name" : "std::moneypunct<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9940,7 +9808,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9954,7 +9822,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9968,7 +9836,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -9982,7 +9850,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -9996,7 +9864,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10010,7 +9878,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10024,7 +9892,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10038,7 +9906,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10178,7 +10046,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10192,7 +10060,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10206,7 +10074,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10220,7 +10088,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10234,7 +10102,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10248,7 +10116,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10262,7 +10130,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10276,7 +10144,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10290,7 +10158,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13209,7 +13077,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13223,7 +13091,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13237,7 +13105,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13251,7 +13119,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13265,7 +13133,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13279,7 +13147,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13293,7 +13161,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13307,7 +13175,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13321,7 +13189,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13461,7 +13329,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13475,7 +13343,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13489,7 +13357,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13503,7 +13371,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13517,7 +13385,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13531,7 +13399,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13545,7 +13413,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13559,7 +13427,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13573,7 +13441,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20304,50 +20172,6 @@
    "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" :
@@ -28528,7 +28352,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char, false>::init",
+   "function_name" : "std::moneypunct_byname<char>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28562,7 +28386,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28596,121 +28420,6 @@
   },
   {
    "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" :
    [
@@ -28734,29 +28443,6 @@
   },
   {
    "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" :
    [
@@ -28848,98 +28534,6 @@
    ]
   },
   {
-   "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",
@@ -29751,19 +29345,6 @@
    "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" :
@@ -31804,136 +31385,6 @@
   },
   {
    "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" :
    [
@@ -31960,32 +31411,6 @@
   },
   {
    "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" :
    [
@@ -32089,255 +31514,6 @@
    ]
   },
   {
-   "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" :
@@ -32368,35 +31544,6 @@
   },
   {
    "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" :
    [
@@ -32512,122 +31659,6 @@
    ]
   },
   {
-   "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" :
@@ -35512,13 +34543,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char, false>::id",
+   "name" : "std::moneypunct<char>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char, false>::intl",
+   "name" : "std::moneypunct<char>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -35536,13 +34567,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t, false>::id",
+   "name" : "std::moneypunct<wchar_t>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t, false>::intl",
+   "name" : "std::moneypunct<wchar_t>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -55071,7 +54102,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55080,7 +54111,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55095,7 +54126,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55104,7 +54135,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55119,7 +54150,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55128,7 +54159,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55143,7 +54174,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55152,7 +54183,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -115260,7 +114291,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -115269,7 +114300,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -135524,7 +134555,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -135534,7 +134565,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
-   "name" : "std::ratio<1000000, 1>",
+   "name" : "std::ratio<1000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
@@ -135574,7 +134605,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -135584,7 +134615,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -135594,7 +134625,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -136706,7 +135737,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<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,
@@ -136715,7 +135746,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<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,
@@ -136724,7 +135755,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<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,
@@ -136738,7 +135769,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -136747,7 +135778,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<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,
@@ -136784,7 +135815,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__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,
@@ -136793,7 +135824,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__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,
@@ -136830,7 +135861,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__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,
@@ -136839,7 +135870,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__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,
@@ -136876,7 +135907,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__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,
@@ -136885,7 +135916,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__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,
@@ -136922,7 +135953,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__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,
@@ -136931,7 +135962,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__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,
@@ -136968,7 +135999,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -136977,7 +136008,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -137046,7 +136077,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -137055,7 +136086,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -137170,7 +136201,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -137179,7 +136210,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<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/x86/source-based/libcap.so.lsdump b/34/64/x86/source-based/libcap.so.lsdump
index 2ccfa70..0a44b6b 100644
--- a/34/64/x86/source-based/libcap.so.lsdump
+++ b/34/64/x86/source-based/libcap.so.lsdump
@@ -49,9 +49,6 @@
  "elf_functions" :
  [
   {
-   "name" : "_libcap_strdup"
-  },
-  {
    "name" : "cap_clear"
   },
   {
@@ -79,6 +76,9 @@
    "name" : "cap_fill"
   },
   {
+   "name" : "cap_fill_flag"
+  },
+  {
    "name" : "cap_free"
   },
   {
@@ -121,12 +121,21 @@
    "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"
   },
   {
@@ -184,6 +193,9 @@
    "name" : "cap_prctlw"
   },
   {
+   "name" : "cap_proc_root"
+  },
+  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -521,6 +533,27 @@
    "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" :
@@ -683,6 +716,33 @@
    "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" :
@@ -716,6 +776,18 @@
    "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",
@@ -823,7 +895,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -838,7 +910,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -868,7 +940,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -889,7 +961,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -904,7 +976,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -998,6 +1070,18 @@
    "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/x86/source-based/libcodec2.so.lsdump b/34/64/x86/source-based/libcodec2.so.lsdump
index 567752b..0c8f2c7 100644
--- a/34/64/x86/source-based/libcodec2.so.lsdump
+++ b/34/64/x86/source-based/libcodec2.so.lsdump
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1268,7 +1268,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -1284,11 +1284,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -1297,7 +1297,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1754,7 +1754,7 @@
      "name" : "C2FrameData::FLAG_CORRUPT"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
    ],
@@ -2492,7 +2492,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -16,
+     "enum_field_value" : 18446744073709551600,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3618,7 +3618,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3976,7 +3976,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Param::CoreIndex::KIND_MASK"
     },
     {
@@ -3988,11 +3988,11 @@
      "name" : "C2Param::CoreIndex::KIND_TUNING"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "C2Param::CoreIndex::KIND_SETTING"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4280,11 +4280,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "C2Config::API_TUNNELING"
     }
    ],
@@ -5895,7 +5895,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "C2Setting::PARAM_KIND"
     }
    ],
@@ -5923,7 +5923,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -5941,7 +5941,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5974,7 +5974,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5989,7 +5989,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6007,7 +6007,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6025,7 +6025,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6052,7 +6052,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6073,7 +6073,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6091,7 +6091,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6112,7 +6112,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6136,7 +6136,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6172,7 +6172,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6211,7 +6211,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6247,7 +6247,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6286,7 +6286,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6319,7 +6319,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6337,7 +6337,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6358,7 +6358,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6379,7 +6379,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   }
  ],
  "functions" : [],
@@ -6702,7 +6702,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6711,7 +6711,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6756,7 +6756,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6765,7 +6765,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6945,7 +6945,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7017,7 +7017,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7224,7 +7224,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7233,7 +7233,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7242,7 +7242,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7251,7 +7251,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7260,7 +7260,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7269,7 +7269,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7278,7 +7278,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7287,7 +7287,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7296,7 +7296,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7305,7 +7305,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7314,7 +7314,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7323,7 +7323,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7332,7 +7332,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7341,7 +7341,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7350,7 +7350,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7359,7 +7359,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7368,7 +7368,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7377,7 +7377,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7386,7 +7386,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7413,7 +7413,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7449,7 +7449,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7494,7 +7494,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7782,7 +7782,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7791,7 +7791,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7800,7 +7800,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -8165,7 +8165,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -8225,7 +8225,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -8275,7 +8275,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9020,7 +9020,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9076,7 +9076,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9560,7 +9560,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10028,7 +10028,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10620,7 +10620,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10987,7 +10987,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86/source-based/libcrypto.so.lsdump b/34/64/x86/source-based/libcrypto.so.lsdump
index a2af453..cb84b57 100644
--- a/34/64/x86/source-based/libcrypto.so.lsdump
+++ b/34/64/x86/source-based/libcrypto.so.lsdump
@@ -38,15 +38,6 @@
    "source_file" : "external/boringssl/src/include/openssl/cipher.h"
   },
   {
-   "alignment" : 4,
-   "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]",
@@ -120,11 +111,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -612,6 +603,9 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
+   "name" : "ASN1_TIME_set_string_X509"
+  },
+  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1863,18 +1857,6 @@
    "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"
   },
   {
@@ -2616,6 +2598,18 @@
    "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"
   },
   {
@@ -3072,6 +3066,15 @@
    "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"
   },
   {
@@ -3507,6 +3510,9 @@
    "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,6 +3732,9 @@
    "name" : "EVP_sha256"
   },
   {
+   "name" : "EVP_sha256_final_with_secret_suffix"
+  },
+  {
    "name" : "EVP_sha384"
   },
   {
@@ -4170,6 +4179,69 @@
    "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"
   },
   {
@@ -4776,6 +4848,27 @@
    "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"
   },
   {
@@ -7365,36 +7458,9 @@
    "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"
   },
   {
@@ -7413,24 +7479,9 @@
    "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"
   },
   {
@@ -8495,23 +8546,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8875,6 +8926,30 @@
      "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_x86_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_x86_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_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -10375,6 +10450,21 @@
    "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" :
@@ -16252,6 +16342,21 @@
    "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" :
@@ -17311,6 +17416,135 @@
    "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" :
@@ -19195,6 +19429,12 @@
    "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",
@@ -20719,6 +20959,318 @@
    "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" :
@@ -27234,10 +27786,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27306,7 +27858,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29322,7 +29874,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30111,7 +30663,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31356,7 +31908,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31377,7 +31929,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -35731,114 +36283,6 @@
    "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" :
@@ -35851,48 +36295,6 @@
    "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",
@@ -35971,66 +36373,6 @@
    "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" :
@@ -36046,18 +36388,6 @@
    "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" :
@@ -36888,24 +37218,6 @@
   },
   {
    "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",
@@ -37023,6 +37335,15 @@
   },
   {
    "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",
@@ -37914,10 +38235,10 @@
   },
   {
    "alignment" : 4,
-   "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",
+   "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",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38069,6 +38390,15 @@
    "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_x86_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_x86_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_x86_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_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
@@ -38339,6 +38669,15 @@
    "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_x86_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
@@ -39120,12 +39459,21 @@
   },
   {
    "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/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
   {
    "alignment" : 4,
@@ -39327,15 +39675,6 @@
   },
   {
    "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",
@@ -39737,7 +40076,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
    "alignment" : 4,
@@ -39809,7 +40148,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/bio.h"
   },
   {
    "alignment" : 4,
@@ -39889,7 +40228,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 344,
+   "size" : 480,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40211,7 +40550,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 700,
+   "size" : 684,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40231,7 +40570,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 36,
+   "size" : 44,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40631,17 +40970,15 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 84,
+   "size" : 76,
    "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
-   "size" : 140,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -40763,12 +41100,22 @@
    "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/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
   {
    "alignment" : 4,
@@ -41021,6 +41368,42 @@
     {
      "field_name" : "asn1_cb",
      "field_offset" : 96,
+     "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_x86_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_x86_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_x86_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_x86_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -42170,7 +42553,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4672,
+     "field_offset" : 4544,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42178,7 +42561,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 588,
+   "size" : 572,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42206,22 +42589,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4800,
+     "field_offset" : 4672,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4992,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5504,
+     "field_offset" : 5376,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5568,
+     "field_offset" : 5440,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42229,7 +42612,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 700,
+   "size" : 684,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42522,7 +42905,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
+     "referenced_type" : "_ZTIA128_h"
     },
     {
      "field_name" : "block_used",
@@ -43052,7 +43435,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -43064,7 +43447,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 580,
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43253,249 +43636,6 @@
    "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" : 4,
-   "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" : 140,
-   "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"
     },
@@ -43776,28 +43916,6 @@
    "source_file" : "external/boringssl/src/include/openssl/kyber.h"
   },
   {
-   "alignment" : 4,
-   "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/x86/source-based/libcrypto_utils.so.lsdump b/34/64/x86/source-based/libcrypto_utils.so.lsdump
index 0db506f..a9ad8f0 100644
--- a/34/64/x86/source-based/libcrypto_utils.so.lsdump
+++ b/34/64/x86/source-based/libcrypto_utils.so.lsdump
@@ -137,13 +137,11 @@
  "qualified_types" :
  [
   {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
-   "size" : 140,
    "source_file" : "system/core/libcrypto_utils/include/crypto_utils/android_pubkey.h"
   },
   {
diff --git a/34/64/x86/source-based/libcurl.so.lsdump b/34/64/x86/source-based/libcurl.so.lsdump
index 512f187..c4b359a 100644
--- a/34/64/x86/source-based/libcurl.so.lsdump
+++ b/34/64/x86/source-based/libcurl.so.lsdump
@@ -111,12 +111,6 @@
    "name" : "Curl_all_content_encodings"
   },
   {
-   "name" : "Curl_alpn_get_proxy_spec"
-  },
-  {
-   "name" : "Curl_alpn_get_spec"
-  },
-  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -207,9 +201,81 @@
    "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"
   },
   {
@@ -279,6 +345,9 @@
    "name" : "Curl_cf_def_send"
   },
   {
+   "name" : "Curl_cf_h1_proxy_insert_after"
+  },
+  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -291,6 +360,9 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
+   "name" : "Curl_cf_http_proxy_get_host"
+  },
+  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -366,15 +438,15 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard"
-  },
-  {
    "name" : "Curl_conn_cf_discard_all"
   },
   {
    "name" : "Curl_conn_cf_discard_chain"
   },
   {
+   "name" : "Curl_conn_cf_discard_sub"
+  },
+  {
    "name" : "Curl_conn_cf_get_select_socks"
   },
   {
@@ -384,6 +456,9 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
+   "name" : "Curl_conn_cf_is_ssl"
+  },
+  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -438,9 +513,6 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
-   "name" : "Curl_conn_http_proxy_add"
-  },
-  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -609,6 +681,72 @@
    "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"
   },
   {
@@ -681,6 +819,15 @@
    "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"
   },
   {
@@ -783,6 +930,9 @@
    "name" : "Curl_http_cookies"
   },
   {
+   "name" : "Curl_http_decode_status"
+  },
+  {
    "name" : "Curl_http_done"
   },
   {
@@ -810,6 +960,24 @@
    "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"
   },
   {
@@ -1485,6 +1653,9 @@
    "name" : "Curl_updatesocket"
   },
   {
+   "name" : "Curl_url_set_authority"
+  },
+  {
    "name" : "Curl_urldecode"
   },
   {
@@ -1848,6 +2019,9 @@
    "name" : "Curl_cfree"
   },
   {
+   "name" : "Curl_cft_h1_proxy"
+  },
+  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4255,6 +4429,10 @@
      "name" : "CURLPROXY_HTTPS"
     },
     {
+     "enum_field_value" : 3,
+     "name" : "CURLPROXY_HTTPS2"
+    },
+    {
      "enum_field_value" : 4,
      "name" : "CURLPROXY_SOCKS4"
     },
diff --git a/34/64/x86/source-based/libdiskconfig.so.lsdump b/34/64/x86/source-based/libdiskconfig.so.lsdump
deleted file mode 100644
index 18926e4..0000000
--- a/34/64/x86/source-based/libdiskconfig.so.lsdump
+++ /dev/null
@@ -1,641 +0,0 @@
-{
- "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,
-   "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" : 4,
-   "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" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "next",
-     "referenced_type" : "_ZTIP10write_list"
-    },
-    {
-     "field_name" : "offset",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIx"
-    },
-    {
-     "field_name" : "len",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIA0_h"
-    }
-   ],
-   "linker_set_key" : "_ZTI10write_list",
-   "name" : "write_list",
-   "referenced_type" : "_ZTI10write_list",
-   "self_type" : "_ZTI10write_list",
-   "size" : 16,
-   "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/x86/source-based/libdmabufheap.so.lsdump b/34/64/x86/source-based/libdmabufheap.so.lsdump
index 05ed37b..a6be39a 100644
--- a/34/64/x86/source-based/libdmabufheap.so.lsdump
+++ b/34/64/x86/source-based/libdmabufheap.so.lsdump
@@ -1500,7 +1500,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1551,7 +1551,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
diff --git a/34/64/x86/source-based/libdumpstateutil.so.lsdump b/34/64/x86/source-based/libdumpstateutil.so.lsdump
index f5754d7..01f6102 100644
--- a/34/64/x86/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/x86/source-based/libdumpstateutil.so.lsdump
@@ -152,6 +152,9 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -201,6 +204,9 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -573,6 +579,12 @@
    "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",
@@ -711,6 +723,13 @@
   },
   {
    "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/x86/source-based/libgralloctypes.so.lsdump b/34/64/x86/source-based/libgralloctypes.so.lsdump
index 123e644..c549474 100644
--- a/34/64/x86/source-based/libgralloctypes.so.lsdump
+++ b/34/64/x86/source-based/libgralloctypes.so.lsdump
@@ -2876,11 +2876,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3467,11 +3467,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4052,11 +4052,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86/source-based/libhardware.so.lsdump b/34/64/x86/source-based/libhardware.so.lsdump
index a385fd5..d9bf0a8 100644
--- a/34/64/x86/source-based/libhardware.so.lsdump
+++ b/34/64/x86/source-based/libhardware.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -935,7 +935,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -956,7 +956,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -974,7 +974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -992,7 +992,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "global_vars" : [],
@@ -1006,7 +1006,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1015,7 +1015,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1033,7 +1033,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1042,7 +1042,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1051,7 +1051,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1060,7 +1060,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1069,7 +1069,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1078,7 +1078,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1087,7 +1087,7 @@
    "referenced_type" : "_ZTIPK11hw_module_t",
    "self_type" : "_ZTIPPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1118,7 +1118,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1128,7 +1128,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "record_types" :
@@ -1167,7 +1167,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1223,7 +1223,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1414,7 +1414,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86/source-based/libhidlbase.so.lsdump b/34/64/x86/source-based/libhidlbase.so.lsdump
index ec47366..96fcc88 100644
--- a/34/64/x86/source-based/libhidlbase.so.lsdump
+++ b/34/64/x86/source-based/libhidlbase.so.lsdump
@@ -263,14 +263,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -283,10 +275,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -299,10 +287,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -311,11 +295,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
   },
   {
    "binding" : "weak",
@@ -1889,22 +1873,6 @@
    "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"
   },
   {
@@ -1920,22 +1888,6 @@
    "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"
   },
   {
@@ -2397,26 +2349,6 @@
   },
   {
    "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"
   },
   {
@@ -2820,10 +2752,6 @@
   },
   {
    "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"
   },
   {
@@ -2840,10 +2768,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2904,10 +2828,6 @@
   },
   {
    "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_"
   },
   {
@@ -2916,10 +2836,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__18functionIFbbEEclEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__18functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS7_S7_S7_PNS_6vectorIPvNS_9allocatorIS9_EEEEEEclES5_S7_S7_S7_S7_SD_"
   },
   {
@@ -2928,14 +2844,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
   },
   {
@@ -2944,6 +2852,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -2956,18 +2868,10 @@
   },
   {
    "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_"
   },
   {
@@ -2984,14 +2888,6 @@
   },
   {
    "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"
   },
   {
@@ -3028,10 +2924,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -3076,6 +2968,10 @@
   },
   {
    "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_"
   },
   {
@@ -3092,10 +2988,6 @@
   },
   {
    "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"
   },
   {
@@ -3104,22 +2996,10 @@
   },
   {
    "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"
   },
   {
@@ -3128,14 +3008,6 @@
   },
   {
    "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_"
   },
   {
@@ -3144,30 +3016,14 @@
   },
   {
    "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"
   },
   {
@@ -3180,10 +3036,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseIPKcNS_9allocatorIS2_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIPvNS_9allocatorIS1_EEED2Ev"
   },
   {
@@ -3192,14 +3044,6 @@
   },
   {
    "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"
   },
   {
@@ -3252,7 +3096,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3260,46 +3104,10 @@
   },
   {
    "binding" : "weak",
-   "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_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEED2Ev"
   },
   {
    "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_"
   },
   {
@@ -3320,10 +3128,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3332,10 +3136,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3344,19 +3144,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3424,26 +3220,10 @@
   },
   {
    "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_"
   },
   {
@@ -3480,70 +3260,26 @@
   },
   {
    "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_"
   },
   {
@@ -3560,10 +3296,6 @@
   },
   {
    "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_"
   },
   {
@@ -3576,11 +3308,7 @@
   },
   {
    "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_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_"
+   "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",
@@ -3596,14 +3324,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_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_"
   },
   {
@@ -3624,19 +3344,15 @@
   },
   {
    "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_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEEiEEbEERKT_DpOT0_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -3652,14 +3368,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIRKS6_EEvOT_"
   },
   {
@@ -3672,10 +3380,6 @@
   },
   {
    "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_"
   },
   {
@@ -3684,18 +3388,6 @@
   },
   {
    "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"
   },
   {
@@ -3720,18 +3412,10 @@
   },
   {
    "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"
   },
   {
@@ -3772,22 +3456,10 @@
   },
   {
    "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_"
   },
   {
@@ -3796,14 +3468,6 @@
   },
   {
    "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"
   },
   {
@@ -3812,10 +3476,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -4104,10 +3764,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -4139,10 +3795,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -4228,10 +3880,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -4379,10 +4027,6 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
-  },
-  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4392,10 +4036,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4405,10 +4045,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4435,10 +4071,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8823,42 +8455,6 @@
    "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" :
@@ -8907,22 +8503,6 @@
    "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" :
@@ -8972,22 +8552,6 @@
   },
   {
    "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" :
    [
@@ -9020,22 +8584,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "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_8hardware27hidl_binder_death_recipientEEE"
-    },
-    {
-     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-    }
-   ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::IBinder>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
@@ -9052,6 +8600,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::wp<android::hardware::BHwBinder>::operator=",
    "linker_set_key" : "_ZN7android2wpINS_8hardware9BHwBinderEEaSERKS3_",
    "parameters" :
@@ -17382,118 +16946,6 @@
    "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" :
@@ -17584,118 +17036,6 @@
    "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" :
@@ -19710,91 +19050,6 @@
   },
   {
    "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" :
    [
@@ -22164,8 +21419,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_x86_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_x86_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_x86_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_x86_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -23515,7 +22770,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_x86_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_x86_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/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/x86/source-based/libmedia_helper.so.lsdump b/34/64/x86/source-based/libmedia_helper.so.lsdump
index 8825756..d8e1824 100644
--- a/34/64/x86/source-based/libmedia_helper.so.lsdump
+++ b/34/64/x86/source-based/libmedia_helper.so.lsdump
@@ -667,21 +667,33 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10valueHacOnE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
+   "name" : "_ZN7android14AudioParameter11valueHacOffE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
+   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -703,6 +715,15 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -712,6 +733,9 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
+   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1425,12 +1449,24 @@
    "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",
@@ -1443,6 +1479,12 @@
    "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",
@@ -1455,6 +1497,12 @@
    "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",
@@ -1497,6 +1545,24 @@
    "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",
@@ -1515,6 +1581,12 @@
    "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/x86/source-based/libmedia_omx.so.lsdump b/34/64/x86/source-based/libmedia_omx.so.lsdump
index c78e932..5ef97be 100644
--- a/34/64/x86/source-based/libmedia_omx.so.lsdump
+++ b/34/64/x86/source-based/libmedia_omx.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5548,7 +5548,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -5564,11 +5564,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -5577,7 +5577,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5920,7 +5920,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5936,71 +5936,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -10605,11 +10605,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -11196,11 +11196,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -11781,11 +11781,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12744,7 +12744,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12762,7 +12762,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12795,7 +12795,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12810,7 +12810,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12828,7 +12828,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12846,7 +12846,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12873,7 +12873,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12918,7 +12918,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12936,7 +12936,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12957,7 +12957,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12981,7 +12981,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13017,7 +13017,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13056,7 +13056,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13092,7 +13092,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13131,7 +13131,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13164,7 +13164,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13182,7 +13182,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13218,7 +13218,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13239,7 +13239,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17010,7 +17010,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17019,7 +17019,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17046,7 +17046,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17073,7 +17073,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17100,7 +17100,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17118,7 +17118,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17235,7 +17235,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17244,7 +17244,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17253,7 +17253,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17262,7 +17262,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17271,7 +17271,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17280,7 +17280,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17289,7 +17289,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17307,7 +17307,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17316,7 +17316,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17325,7 +17325,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17334,7 +17334,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17343,7 +17343,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17352,7 +17352,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17361,7 +17361,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17370,7 +17370,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17379,7 +17379,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17388,7 +17388,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17406,7 +17406,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17415,7 +17415,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17442,7 +17442,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17460,7 +17460,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -18886,6 +18886,15 @@
   },
   {
    "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",
@@ -18994,6 +19003,15 @@
   },
   {
    "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",
@@ -20340,7 +20358,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20367,7 +20385,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -20547,7 +20565,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20577,7 +20595,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22352,11 +22370,13 @@
    "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"
   },
   {
@@ -23164,7 +23184,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23220,7 +23240,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23405,7 +23425,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23549,7 +23569,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23842,7 +23862,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24224,7 +24244,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -35343,6 +35363,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 408,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -43447,6 +43473,15 @@
   },
   {
    "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/x86/source-based/libprocessgroup.so.lsdump b/34/64/x86/source-based/libprocessgroup.so.lsdump
index a375167..a63c9c6 100644
--- a/34/64/x86/source-based/libprocessgroup.so.lsdump
+++ b/34/64/x86/source-based/libprocessgroup.so.lsdump
@@ -145,6 +145,9 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
+   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
+  },
+  {
    "name" : "_Z24sendSignalToProcessGroupjii"
   },
   {
@@ -246,7 +249,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1134,9 +1137,15 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1152,9 +1161,15 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1167,12 +1182,18 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1200,21 +1221,42 @@
    "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/x86/source-based/libsqlite.so.lsdump b/34/64/x86/source-based/libsqlite.so.lsdump
index 4e71874..4282a1d 100644
--- a/34/64/x86/source-based/libsqlite.so.lsdump
+++ b/34/64/x86/source-based/libsqlite.so.lsdump
@@ -337,6 +337,9 @@
    "name" : "sqlite3_interrupt"
   },
   {
+   "name" : "sqlite3_is_interrupted"
+  },
+  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -691,6 +694,9 @@
    "name" : "sqlite3_value_dup"
   },
   {
+   "name" : "sqlite3_value_encoding"
+  },
+  {
    "name" : "sqlite3_value_free"
   },
   {
diff --git a/34/64/x86/source-based/libssl.so.lsdump b/34/64/x86/source-based/libssl.so.lsdump
index b197736..4b220fb 100644
--- a/34/64/x86/source-based/libssl.so.lsdump
+++ b/34/64/x86/source-based/libssl.so.lsdump
@@ -20,6 +20,15 @@
    "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]",
@@ -65,6 +74,15 @@
    "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]",
@@ -119,6 +137,15 @@
    "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]",
@@ -165,11 +192,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -200,6 +227,24 @@
    "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]",
@@ -510,6 +555,9 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
+   "name" : "SSL_CIPHER_get_handshake_digest"
+  },
+  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -534,9 +582,6 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
-   "name" : "SSL_CIPHER_get_value"
-  },
-  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -801,6 +846,9 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
+   "name" : "SSL_CTX_set1_group_ids"
+  },
+  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1362,6 +1410,24 @@
    "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"
   },
   {
@@ -1422,6 +1488,12 @@
    "name" : "SSL_get_finished"
   },
   {
+   "name" : "SSL_get_group_id"
+  },
+  {
+   "name" : "SSL_get_group_name"
+  },
+  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1443,6 +1515,9 @@
    "name" : "SSL_get_mode"
   },
   {
+   "name" : "SSL_get_negotiated_group"
+  },
+  {
    "name" : "SSL_get_options"
   },
   {
@@ -1713,6 +1788,9 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
+   "name" : "SSL_set1_group_ids"
+  },
+  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2091,6 +2169,9 @@
    "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"
   },
   {
@@ -6698,6 +6779,18 @@
    "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" :
@@ -6794,18 +6887,6 @@
    "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" :
@@ -7964,6 +8045,24 @@
    "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" :
@@ -10799,6 +10898,96 @@
    "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" :
@@ -11066,6 +11255,30 @@
    "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" :
@@ -11159,6 +11372,18 @@
    "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" :
@@ -12416,6 +12641,24 @@
    "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" :
@@ -14242,6 +14485,15 @@
   },
   {
    "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",
@@ -14269,6 +14521,15 @@
   },
   {
    "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",
@@ -14314,6 +14575,15 @@
   },
   {
    "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",
@@ -14323,6 +14593,15 @@
   },
   {
    "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",
@@ -14341,6 +14620,24 @@
   },
   {
    "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",
@@ -14368,6 +14665,24 @@
   },
   {
    "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",
@@ -14377,6 +14692,33 @@
   },
   {
    "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",
@@ -14530,6 +14872,15 @@
   },
   {
    "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",
@@ -14620,6 +14971,15 @@
   },
   {
    "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",
@@ -14740,15 +15100,6 @@
   },
   {
    "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",
@@ -14992,15 +15343,6 @@
   },
   {
    "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",
@@ -18223,6 +18565,15 @@
   },
   {
    "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",
@@ -18466,6 +18817,15 @@
   },
   {
    "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",
@@ -18475,6 +18835,15 @@
   },
   {
    "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",
@@ -18484,6 +18853,24 @@
   },
   {
    "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",
@@ -18529,6 +18916,15 @@
   },
   {
    "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",
@@ -19105,6 +19501,15 @@
   },
   {
    "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",
@@ -19114,6 +19519,24 @@
   },
   {
    "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",
@@ -19159,6 +19582,15 @@
   },
   {
    "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",
@@ -19321,15 +19753,6 @@
   },
   {
    "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",
@@ -19362,7 +19785,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
    "alignment" : 4,
@@ -19398,7 +19821,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 4,
@@ -19468,6 +19891,16 @@
    "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",
@@ -19498,6 +19931,16 @@
    "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",
@@ -19538,6 +19981,16 @@
    "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",
@@ -19568,6 +20021,26 @@
    "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",
@@ -19868,7 +20341,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 588,
+   "size" : 572,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20194,6 +20667,16 @@
    "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",
@@ -20366,13 +20849,11 @@
    "source_file" : "external/boringssl/src/include/openssl/bytestring.h"
   },
   {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
-   "size" : 140,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -20424,7 +20905,17 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 32,
+   "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,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20440,6 +20931,16 @@
   {
    "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",
@@ -20450,6 +20951,26 @@
   {
    "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",
@@ -20500,6 +21021,16 @@
   {
    "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",
@@ -20544,7 +21075,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" : 588,
+   "size" : 572,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22333,7 +22864,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4672,
+     "field_offset" : 4544,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22341,7 +22872,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 588,
+   "size" : 572,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22369,22 +22900,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4800,
+     "field_offset" : 4672,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4992,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5504,
+     "field_offset" : 5376,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5568,
+     "field_offset" : 5440,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22392,7 +22923,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 700,
+   "size" : 684,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23158,7 +23689,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -23170,7 +23701,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 580,
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -23497,249 +24028,6 @@
    "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" : 4,
-   "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" : 140,
-   "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"
     },
@@ -24148,6 +24436,41 @@
    [
     {
      "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"
     }
    ],
@@ -24183,6 +24506,76 @@
    [
     {
      "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"
     }
    ],
@@ -24358,6 +24751,41 @@
    [
     {
      "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"
     }
    ],
@@ -26043,7 +26471,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" : 588,
+   "size" : 572,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26066,7 +26494,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" : 700,
+   "size" : 684,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26331,6 +26759,20 @@
   },
   {
    "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",
@@ -26345,6 +26787,34 @@
   },
   {
    "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/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump b/34/64/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump
index 0547276..5384ba9 100644
--- a/34/64/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/34/64/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -5450,7 +5450,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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -5480,7 +5480,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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6733,13 +6733,19 @@
      "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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6830,13 +6836,19 @@
      "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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9099,7 +9111,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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9118,7 +9130,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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
diff --git a/34/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump b/34/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
index b57d79e..3435ed8 100644
--- a/34/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/34/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -981,6 +981,9 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
+   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy"
   },
   {
@@ -11700,11 +11703,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12291,11 +12294,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12876,11 +12879,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14473,6 +14476,37 @@
   },
   {
    "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/x86/source-based/libstagefright_foundation.so.lsdump b/34/64/x86/source-based/libstagefright_foundation.so.lsdump
index 3b4fc1f..fac3d3c 100644
--- a/34/64/x86/source-based/libstagefright_foundation.so.lsdump
+++ b/34/64/x86/source-based/libstagefright_foundation.so.lsdump
@@ -24050,7 +24050,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_static/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_x86_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -24092,13 +24092,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_x86_static/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_x86_static/e560d7b19ebf7276b3e850d3d346dec8/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_x86_static/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_x86_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/34/64/x86/source-based/libstagefright_omx.so.lsdump b/34/64/x86/source-based/libstagefright_omx.so.lsdump
index 64ac504..3e7f526 100644
--- a/34/64/x86/source-based/libstagefright_omx.so.lsdump
+++ b/34/64/x86/source-based/libstagefright_omx.so.lsdump
@@ -642,6 +642,9 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
+   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy"
   },
   {
@@ -15368,6 +15371,37 @@
   },
   {
    "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" :
    [
@@ -43247,6 +43281,15 @@
   },
   {
    "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/x86/source-based/libstagefright_omx_utils.so.lsdump b/34/64/x86/source-based/libstagefright_omx_utils.so.lsdump
index ecf2ee5..924b220 100644
--- a/34/64/x86/source-based/libstagefright_omx_utils.so.lsdump
+++ b/34/64/x86/source-based/libstagefright_omx_utils.so.lsdump
@@ -9853,11 +9853,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24585,6 +24585,12 @@
     },
     {
      "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/x86/source-based/libtinyalsa.so.lsdump b/34/64/x86/source-based/libtinyalsa.so.lsdump
index 6822d0d..4aa0079 100644
--- a/34/64/x86/source-based/libtinyalsa.so.lsdump
+++ b/34/64/x86/source-based/libtinyalsa.so.lsdump
@@ -218,6 +218,9 @@
    "name" : "pcm_get_subdevice"
   },
   {
+   "name" : "pcm_get_xruns"
+  },
+  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1298,6 +1301,18 @@
    "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/x86/source-based/libui.so.lsdump b/34/64/x86/source-based/libui.so.lsdump
index 882bcdf..f08d455 100644
--- a/34/64/x86/source-based/libui.so.lsdump
+++ b/34/64/x86/source-based/libui.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -859,10 +859,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -871,18 +867,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1213,6 +1201,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1453,10 +1445,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common14ExtendableTypeEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common9DataspaceEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
   },
   {
@@ -1465,21 +1453,9 @@
   },
   {
    "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"
   },
   {
@@ -1507,10 +1483,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1527,10 +1499,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1550,10 +1518,6 @@
    "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"
   },
   {
@@ -2342,10 +2306,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_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_"
   },
   {
@@ -2374,10 +2334,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common14ExtendableTypeENS_9allocatorIS6_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEED2Ev"
   },
   {
@@ -2386,31 +2342,15 @@
   },
   {
    "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_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EjjS9_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lj4EEEEC2EjjS5_"
   },
   {
    "binding" : "weak",
@@ -2418,14 +2358,6 @@
   },
   {
    "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_EEED2Ev"
   },
   {
@@ -2450,10 +2382,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLj128EEEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2502,30 +2430,14 @@
   },
   {
    "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_"
   },
   {
@@ -2538,26 +2450,10 @@
   },
   {
    "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_"
   },
   {
@@ -2566,15 +2462,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEj"
   },
   {
    "binding" : "weak",
@@ -2590,10 +2482,6 @@
   },
   {
    "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_"
   },
   {
@@ -2614,14 +2502,6 @@
   },
   {
    "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"
   },
   {
@@ -2630,10 +2510,6 @@
   },
   {
    "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_"
   },
   {
@@ -2642,14 +2518,6 @@
   },
   {
    "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"
   },
   {
@@ -2662,26 +2530,10 @@
   },
   {
    "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"
   },
   {
@@ -2690,18 +2542,6 @@
   },
   {
    "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"
   },
   {
@@ -4023,7 +3863,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -4039,11 +3879,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -4052,7 +3892,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4244,7 +4084,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4260,71 +4100,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4644,7 +4484,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4652,7 +4492,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7414,7 +7254,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8396,11 +8236,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8987,11 +8827,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9572,11 +9412,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10888,7 +10728,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10906,7 +10746,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10939,7 +10779,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10954,7 +10794,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10972,7 +10812,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10990,7 +10830,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11017,7 +10857,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11062,7 +10902,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11080,7 +10920,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11101,7 +10941,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11125,7 +10965,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11161,7 +11001,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11200,7 +11040,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11236,7 +11076,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11275,7 +11115,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11308,7 +11148,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11326,7 +11166,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11362,7 +11202,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11383,7 +11223,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14529,19 +14369,6 @@
    "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" :
@@ -14571,22 +14398,6 @@
    "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" :
@@ -14603,22 +14414,6 @@
    "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" :
@@ -16301,6 +16096,12 @@
    "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" :
@@ -22218,7 +22019,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22227,7 +22028,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22272,7 +22073,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22308,7 +22109,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22317,7 +22118,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22407,7 +22208,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22416,7 +22217,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22425,7 +22226,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22434,7 +22235,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22443,7 +22244,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22452,7 +22253,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22461,7 +22262,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22479,7 +22280,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22488,7 +22289,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22497,7 +22298,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22506,7 +22307,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22515,7 +22316,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22524,7 +22325,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22533,7 +22334,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22542,7 +22343,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22551,7 +22352,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22560,7 +22361,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22578,7 +22379,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22587,7 +22388,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22614,7 +22415,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22641,7 +22442,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25566,7 +25367,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25697,7 +25498,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25735,7 +25536,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28272,7 +28073,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28328,7 +28129,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28492,7 +28293,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28589,7 +28390,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28748,7 +28549,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28936,7 +28737,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86/source-based/libunwindstack.so.lsdump b/34/64/x86/source-based/libunwindstack.so.lsdump
index 3c0d835..096baf4 100644
--- a/34/64/x86/source-based/libunwindstack.so.lsdump
+++ b/34/64/x86/source-based/libunwindstack.so.lsdump
@@ -102,24 +102,6 @@
   },
   {
    "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" : 4,
-   "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" : 4,
    "linker_set_key" : "_ZTIA64_y",
    "name" : "unsigned long long[64]",
    "referenced_type" : "_ZTIy",
@@ -247,402 +229,369 @@
    "name" : "AsmGetRegs"
   },
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
+   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
+   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
   },
   {
-   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
+   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
+   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_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" : "_RNvXs7_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Cs3jb9llYclZH_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
+   "name" : "_RNvXs7_Csc3gp0nclRww_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
+   "name" : "_RNvXs7_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXsC_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
    "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE"
-  },
-  {
-   "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"
   },
   {
@@ -2531,45 +2480,6 @@
    "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"
   },
   {
@@ -3306,10 +3216,13 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
   },
   {
    "binding" : "weak",
@@ -3378,9 +3291,6 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
-   "name" : "_ZTVN11unwindstack10RegsMips64E"
-  },
-  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3572,9 +3482,6 @@
    "name" : "_ZTVN11unwindstack8RegsImplIyEE"
   },
   {
-   "name" : "_ZTVN11unwindstack8RegsMipsE"
-  },
-  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3638,6 +3545,9 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
+  },
+  {
+   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3809,48 +3719,6 @@
    "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" :
    [
@@ -4181,163 +4049,6 @@
    "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" :
    [
@@ -4363,14 +4074,6 @@
     },
     {
      "enum_field_value" : 5,
-     "name" : "unwindstack::ARCH_MIPS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "unwindstack::ARCH_MIPS64"
-    },
-    {
-     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4638,163 +4341,6 @@
    [
     {
      "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"
     },
     {
@@ -4900,194 +4446,6 @@
    "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" :
@@ -7819,194 +7177,6 @@
    "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",
@@ -8939,15 +8109,6 @@
   },
   {
    "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",
@@ -9308,15 +8469,6 @@
   },
   {
    "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",
@@ -9833,82 +8985,6 @@
      "referenced_type" : "_ZTIN11unwindstack8RegsImplIyEE"
     }
    ],
-   "linker_set_key" : "_ZTIN11unwindstack10RegsMips64E",
-   "name" : "unwindstack::RegsMips64",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
-   "self_type" : "_ZTIN11unwindstack10RegsMips64E",
-   "size" : 32,
-   "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" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTIN11unwindstack8RegsImplIyEE"
-    }
-   ],
    "linker_set_key" : "_ZTIN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64",
    "record_kind" : "class",
@@ -10636,32 +9712,6 @@
    "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" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "type",
      "referenced_type" : "_ZTIN11unwindstack17DwarfLocationEnumE"
     },
@@ -11004,48 +10054,6 @@
      "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" : 20,
-   "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" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ss_sp",
-     "referenced_type" : "_ZTIy"
-    },
-    {
      "field_name" : "ss_flags",
      "field_offset" : 64,
      "referenced_type" : "_ZTIi"
@@ -11439,68 +10447,6 @@
   },
   {
    "alignment" : 4,
-   "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" : 4,
-   "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" : 160,
-     "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" : 292,
-   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
-  },
-  {
-   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -11903,22 +10849,6 @@
    "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" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "sig",
      "referenced_type" : "_ZTIy"
     }
@@ -12081,103 +11011,6 @@
    "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" : 4,
-   "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" : 288,
-     "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" : 620,
-   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "regs",
      "referenced_type" : "_ZTIA32_y"
     }
@@ -13761,82 +12594,6 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTIN11unwindstack8RegsImplIjEE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN11unwindstack8RegsMipsE",
-   "name" : "unwindstack::RegsMips",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
-   "self_type" : "_ZTIN11unwindstack8RegsMipsE",
-   "size" : 32,
-   "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" : 4,
    "fields" :
    [
     {
diff --git a/34/64/x86/source-based/libutils.so.lsdump b/34/64/x86/source-based/libutils.so.lsdump
index 9f63b0c..808b3ac 100644
--- a/34/64/x86/source-based/libutils.so.lsdump
+++ b/34/64/x86/source-based/libutils.so.lsdump
@@ -492,10 +492,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -507,10 +503,6 @@
    "name" : "_ZN7android2spINS_6ThreadEE5clearEv"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_6ThreadEEaSEOS2_"
-  },
-  {
    "name" : "_ZN7android30get_report_sysprop_change_funcEv"
   },
   {
@@ -745,9 +737,6 @@
    "name" : "_ZN7android7String813appendFormatVEPKcPc"
   },
   {
-   "name" : "_ZN7android7String816convertToResPathEv"
-  },
-  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1226,10 +1215,6 @@
   },
   {
    "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_"
   },
   {
@@ -1254,10 +1239,6 @@
   },
   {
    "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_"
   },
   {
@@ -1270,10 +1251,6 @@
   },
   {
    "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"
   },
   {
@@ -5763,19 +5740,6 @@
    "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" :
@@ -5821,22 +5785,6 @@
    "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" :
@@ -7067,19 +7015,6 @@
    "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/x86/source-based/libxml2.so.lsdump b/34/64/x86/source-based/libxml2.so.lsdump
index 243219c..c4eaf14 100644
--- a/34/64/x86/source-based/libxml2.so.lsdump
+++ b/34/64/x86/source-based/libxml2.so.lsdump
@@ -718,6 +718,9 @@
    "name" : "xmlCtxtResetPush"
   },
   {
+   "name" : "xmlCtxtSetMaxAmplification"
+  },
+  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1402,6 +1405,9 @@
    "name" : "xmlMemShow"
   },
   {
+   "name" : "xmlMemSize"
+  },
+  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1915,6 +1921,9 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
+   "name" : "xmlParserInputBufferCreateString"
+  },
+  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3001,6 +3010,9 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
+   "name" : "xmlTextReaderSetMaxAmplification"
+  },
+  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5389,6 +5401,43 @@
    "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"
     },
@@ -5971,6 +6020,10 @@
      "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"
     },
@@ -9490,6 +9543,10 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -13970,6 +14027,21 @@
    "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" :
@@ -17219,6 +17291,18 @@
    "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" :
@@ -19742,6 +19826,18 @@
    "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" :
@@ -22618,7 +22714,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25406,6 +25502,21 @@
    "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" :
@@ -35289,13 +35400,18 @@
      "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" : 480,
+   "size" : 484,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -35979,7 +36095,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "standalone",
+     "field_name" : "flags",
      "field_offset" : 416,
      "referenced_type" : "_ZTIi"
     },
diff --git a/34/64/x86/source-based/libyuv.so.lsdump b/34/64/x86/source-based/libyuv.so.lsdump
index 37f583d..63d0417 100644
--- a/34/64/x86/source-based/libyuv.so.lsdump
+++ b/34/64/x86/source-based/libyuv.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIs",
    "self_type" : "_ZTIA16_s",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -17,7 +17,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA256_j",
    "size" : 1024,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 1,
@@ -26,7 +26,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA32_h",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -175,12 +175,36 @@
    "name" : "ABGRToI420"
   },
   {
+   "name" : "ABGRToJ400"
+  },
+  {
+   "name" : "ABGRToJ420"
+  },
+  {
+   "name" : "ABGRToJ422"
+  },
+  {
    "name" : "ABGRToNV12"
   },
   {
    "name" : "ABGRToNV21"
   },
   {
+   "name" : "ABGRToUVJRow_AVX2"
+  },
+  {
+   "name" : "ABGRToUVJRow_Any_AVX2"
+  },
+  {
+   "name" : "ABGRToUVJRow_Any_SSSE3"
+  },
+  {
+   "name" : "ABGRToUVJRow_C"
+  },
+  {
+   "name" : "ABGRToUVJRow_SSSE3"
+  },
+  {
    "name" : "ABGRToUVRow_AVX2"
   },
   {
@@ -196,6 +220,21 @@
    "name" : "ABGRToUVRow_SSSE3"
   },
   {
+   "name" : "ABGRToYJRow_AVX2"
+  },
+  {
+   "name" : "ABGRToYJRow_Any_AVX2"
+  },
+  {
+   "name" : "ABGRToYJRow_Any_SSSE3"
+  },
+  {
+   "name" : "ABGRToYJRow_C"
+  },
+  {
+   "name" : "ABGRToYJRow_SSSE3"
+  },
+  {
    "name" : "ABGRToYRow_AVX2"
   },
   {
@@ -685,6 +724,9 @@
    "name" : "ARGBToI420"
   },
   {
+   "name" : "ARGBToI420Alpha"
+  },
+  {
    "name" : "ARGBToI422"
   },
   {
@@ -1072,6 +1114,24 @@
    "name" : "DetilePlane"
   },
   {
+   "name" : "DetilePlane_16"
+  },
+  {
+   "name" : "DetileRow_16_AVX"
+  },
+  {
+   "name" : "DetileRow_16_Any_AVX"
+  },
+  {
+   "name" : "DetileRow_16_Any_SSE2"
+  },
+  {
+   "name" : "DetileRow_16_C"
+  },
+  {
+   "name" : "DetileRow_16_SSE2"
+  },
+  {
    "name" : "DetileRow_Any_SSE2"
   },
   {
@@ -1093,6 +1153,18 @@
    "name" : "DetileSplitUVRow_SSSE3"
   },
   {
+   "name" : "DetileToYUY2"
+  },
+  {
+   "name" : "DetileToYUY2_Any_SSE2"
+  },
+  {
+   "name" : "DetileToYUY2_C"
+  },
+  {
+   "name" : "DetileToYUY2_SSE2"
+  },
+  {
    "name" : "DivideRow_16_AVX2"
   },
   {
@@ -1132,9 +1204,6 @@
    "name" : "GetARGBBlend"
   },
   {
-   "name" : "GetXCR0"
-  },
-  {
    "name" : "H010ToAB30"
   },
   {
@@ -1252,6 +1321,9 @@
    "name" : "I010Copy"
   },
   {
+   "name" : "I010Rotate"
+  },
+  {
    "name" : "I010ToAB30"
   },
   {
@@ -1309,6 +1381,9 @@
    "name" : "I210Copy"
   },
   {
+   "name" : "I210Rotate"
+  },
+  {
    "name" : "I210ToAB30"
   },
   {
@@ -1408,6 +1483,9 @@
    "name" : "I212ToARGBRow_SSSE3"
   },
   {
+   "name" : "I212ToI420"
+  },
+  {
    "name" : "I212ToI422"
   },
   {
@@ -1456,6 +1534,12 @@
    "name" : "I410AlphaToARGBRow_C"
   },
   {
+   "name" : "I410Copy"
+  },
+  {
+   "name" : "I410Rotate"
+  },
+  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1495,9 +1579,15 @@
    "name" : "I410ToI010"
   },
   {
+   "name" : "I410ToI420"
+  },
+  {
    "name" : "I410ToI444"
   },
   {
+   "name" : "I412ToI420"
+  },
+  {
    "name" : "I412ToI444"
   },
   {
@@ -1606,6 +1696,9 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
+   "name" : "I420ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1756,6 +1849,18 @@
    "name" : "I422ToNV21"
   },
   {
+   "name" : "I422ToRAW"
+  },
+  {
+   "name" : "I422ToRGB24"
+  },
+  {
+   "name" : "I422ToRGB24Matrix"
+  },
+  {
+   "name" : "I422ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I422ToRGB24Row_AVX2"
   },
   {
@@ -1774,6 +1879,9 @@
    "name" : "I422ToRGB565"
   },
   {
+   "name" : "I422ToRGB565Matrix"
+  },
+  {
    "name" : "I422ToRGB565Row_AVX2"
   },
   {
@@ -1918,6 +2026,30 @@
    "name" : "I444ToNV21"
   },
   {
+   "name" : "I444ToRAW"
+  },
+  {
+   "name" : "I444ToRGB24"
+  },
+  {
+   "name" : "I444ToRGB24Matrix"
+  },
+  {
+   "name" : "I444ToRGB24Row_AVX2"
+  },
+  {
+   "name" : "I444ToRGB24Row_Any_AVX2"
+  },
+  {
+   "name" : "I444ToRGB24Row_Any_SSSE3"
+  },
+  {
+   "name" : "I444ToRGB24Row_C"
+  },
+  {
+   "name" : "I444ToRGB24Row_SSSE3"
+  },
+  {
    "name" : "InitCpuFlags"
   },
   {
@@ -2014,6 +2146,12 @@
    "name" : "MM21ToNV12"
   },
   {
+   "name" : "MM21ToYUY2"
+  },
+  {
+   "name" : "MT2TToP010"
+  },
+  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -2044,12 +2182,6 @@
    "name" : "MergeARGBPlane"
   },
   {
-   "name" : "MergeARGBPlaneAlpha"
-  },
-  {
-   "name" : "MergeARGBPlaneOpaque"
-  },
-  {
    "name" : "MergeARGBRow_AVX2"
   },
   {
@@ -2095,9 +2227,15 @@
    "name" : "MergeUVRow_AVX2"
   },
   {
+   "name" : "MergeUVRow_AVX512BW"
+  },
+  {
    "name" : "MergeUVRow_Any_AVX2"
   },
   {
+   "name" : "MergeUVRow_Any_AVX512BW"
+  },
+  {
    "name" : "MergeUVRow_Any_SSE2"
   },
   {
@@ -2158,6 +2296,9 @@
    "name" : "MirrorPlane"
   },
   {
+   "name" : "MirrorRow_16_C"
+  },
+  {
    "name" : "MirrorRow_AVX2"
   },
   {
@@ -2383,9 +2524,15 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
+   "name" : "P010ToI010"
+  },
+  {
    "name" : "P010ToP410"
   },
   {
+   "name" : "P012ToI012"
+  },
+  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2671,6 +2818,9 @@
    "name" : "RGBScale"
   },
   {
+   "name" : "RiscvCpuCaps"
+  },
+  {
    "name" : "RotatePlane"
   },
   {
@@ -2683,6 +2833,9 @@
    "name" : "RotatePlane90"
   },
   {
+   "name" : "RotatePlane_16"
+  },
+  {
    "name" : "Scale"
   },
   {
@@ -2824,6 +2977,9 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
+   "name" : "ScalePlaneDown2_16To8"
+  },
+  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -2857,6 +3013,12 @@
    "name" : "ScalePlane_16"
   },
   {
+   "name" : "ScaleRowDown2Box_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Box_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -2884,6 +3046,12 @@
    "name" : "ScaleRowDown2Box_SSSE3"
   },
   {
+   "name" : "ScaleRowDown2Linear_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -2902,6 +3070,12 @@
    "name" : "ScaleRowDown2Linear_SSSE3"
   },
   {
+   "name" : "ScaleRowDown2_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -3331,12 +3505,6 @@
    "name" : "SplitARGBPlane"
   },
   {
-   "name" : "SplitARGBPlaneAlpha"
-  },
-  {
-   "name" : "SplitARGBPlaneOpaque"
-  },
-  {
    "name" : "SplitARGBRow_AVX2"
   },
   {
@@ -3463,15 +3631,33 @@
    "name" : "SwapUVRow_SSSE3"
   },
   {
+   "name" : "Transpose4x4_32_AVX2"
+  },
+  {
+   "name" : "Transpose4x4_32_C"
+  },
+  {
+   "name" : "Transpose4x4_32_SSE2"
+  },
+  {
    "name" : "TransposePlane"
   },
   {
+   "name" : "TransposePlane_16"
+  },
+  {
+   "name" : "TransposeUVWx8_16_C"
+  },
+  {
    "name" : "TransposeUVWx8_C"
   },
   {
    "name" : "TransposeUVWxH_C"
   },
   {
+   "name" : "TransposeWx8_16_C"
+  },
+  {
    "name" : "TransposeWx8_Any_SSSE3"
   },
   {
@@ -3481,6 +3667,9 @@
    "name" : "TransposeWx8_SSSE3"
   },
   {
+   "name" : "TransposeWxH_16_C"
+  },
+  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -3607,6 +3796,9 @@
    "name" : "UYVYToYRow_SSE2"
   },
   {
+   "name" : "UnpackMT2T_C"
+  },
+  {
    "name" : "ValidateJpeg"
   },
   {
@@ -3640,6 +3832,21 @@
    "name" : "YUY2ToNV12"
   },
   {
+   "name" : "YUY2ToNVUVRow_AVX2"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_Any_AVX2"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_Any_SSE2"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_C"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_SSE2"
+  },
+  {
    "name" : "YUY2ToUV422Row_AVX2"
   },
   {
@@ -3881,7 +4088,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3922,7 +4129,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3955,7 +4162,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4268,7 +4475,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -4517,7 +4724,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -4545,7 +4752,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -4569,7 +4776,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -4599,7 +4806,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_AVX2",
@@ -4617,7 +4824,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_AVX2",
@@ -4635,7 +4842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_SSSE3",
@@ -4653,7 +4860,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -4671,7 +4878,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_SSSE3",
@@ -4689,7 +4896,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4716,7 +4923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_AVX2",
@@ -4734,7 +4941,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_AVX2",
@@ -4752,7 +4959,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_SSSE3",
@@ -4770,7 +4977,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -4788,7 +4995,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_SSSE3",
@@ -4806,7 +5013,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -4833,7 +5040,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -4872,7 +5079,112 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -4905,7 +5217,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -4938,7 +5250,127 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+  },
+  {
+   "function_name" : "libyuv::ABGRToUVJRow_AVX2",
+   "linker_set_key" : "ABGRToUVJRow_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "ABGRToUVJRow_Any_AVX2",
+   "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_Any_SSSE3",
+   "linker_set_key" : "ABGRToUVJRow_Any_SSSE3",
+   "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_SSSE3",
+   "linker_set_key" : "ABGRToUVJRow_SSSE3",
+   "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::ABGRToUVRow_AVX2",
@@ -4962,7 +5394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_AVX2",
@@ -4986,7 +5418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_SSSE3",
@@ -5010,7 +5442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -5034,7 +5466,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_SSSE3",
@@ -5058,7 +5490,97 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::ABGRToYJRow_AVX2",
+   "linker_set_key" : "ABGRToYJRow_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "ABGRToYJRow_Any_AVX2",
+   "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_Any_SSSE3",
+   "linker_set_key" : "ABGRToYJRow_Any_SSSE3",
+   "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_SSSE3",
+   "linker_set_key" : "ABGRToYJRow_SSSE3",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_AVX2",
@@ -5076,7 +5598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_AVX2",
@@ -5094,7 +5616,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_SSSE3",
@@ -5112,7 +5634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -5130,7 +5652,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_SSSE3",
@@ -5148,7 +5670,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -5175,7 +5697,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -5193,7 +5715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -5220,7 +5742,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -5238,7 +5760,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -5265,7 +5787,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -5283,7 +5805,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -5313,7 +5835,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -5334,7 +5856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -5361,7 +5883,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -5388,7 +5910,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_AVX2",
@@ -5406,7 +5928,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_AVX2",
@@ -5424,7 +5946,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_SSSE3",
@@ -5442,7 +5964,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -5460,7 +5982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_SSSE3",
@@ -5478,7 +6000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -5505,7 +6027,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_SSE2",
@@ -5523,7 +6045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -5541,7 +6063,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_SSE2",
@@ -5559,7 +6081,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -5598,7 +6120,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -5622,7 +6144,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -5640,7 +6162,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -5667,7 +6189,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_SSE2",
@@ -5685,7 +6207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -5703,7 +6225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_SSE2",
@@ -5721,7 +6243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -5760,7 +6282,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -5784,7 +6306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -5802,7 +6324,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -5835,7 +6357,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_AVX2",
@@ -5856,7 +6378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_AVX2",
@@ -5877,7 +6399,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_SSE2",
@@ -5898,7 +6420,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -5919,7 +6441,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_SSE2",
@@ -5940,7 +6462,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -5964,7 +6486,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_SSE2",
@@ -5988,7 +6510,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -6015,7 +6537,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_AVX2",
@@ -6033,7 +6555,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_AVX2",
@@ -6051,7 +6573,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_SSSE3",
@@ -6069,7 +6591,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -6087,7 +6609,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_SSSE3",
@@ -6105,7 +6627,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -6138,7 +6660,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -6159,7 +6681,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_SSSE3",
@@ -6180,7 +6702,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -6216,7 +6738,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -6246,7 +6768,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -6267,7 +6789,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_SSSE3",
@@ -6288,7 +6810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -6318,7 +6840,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -6336,7 +6858,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_X86",
@@ -6354,7 +6876,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -6381,7 +6903,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -6408,7 +6930,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -6435,7 +6957,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_AVX2",
@@ -6453,7 +6975,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_AVX2",
@@ -6471,7 +6993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_SSE2",
@@ -6489,7 +7011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -6507,7 +7029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_SSE2",
@@ -6525,7 +7047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -6552,7 +7074,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_AVX2",
@@ -6570,7 +7092,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_AVX2",
@@ -6588,7 +7110,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_SSE2",
@@ -6606,7 +7128,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -6624,7 +7146,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_SSE2",
@@ -6642,7 +7164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -6663,7 +7185,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -6690,7 +7212,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_AVX2",
@@ -6708,7 +7230,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_AVX2",
@@ -6726,7 +7248,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_SSE2",
@@ -6744,7 +7266,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -6762,7 +7284,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_SSE2",
@@ -6780,7 +7302,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -6807,7 +7329,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -6825,7 +7347,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_SSSE3",
@@ -6843,7 +7365,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -6870,7 +7392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -6906,7 +7428,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -6936,7 +7458,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -6960,7 +7482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_SSSE3",
@@ -6984,7 +7506,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -7011,7 +7533,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_AVX2",
@@ -7029,7 +7551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_AVX2",
@@ -7047,7 +7569,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_SSE2",
@@ -7065,7 +7587,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -7083,7 +7605,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_SSE2",
@@ -7101,7 +7623,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -7134,7 +7656,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_AVX2",
@@ -7155,7 +7677,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_AVX2",
@@ -7176,7 +7698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_SSE2",
@@ -7197,7 +7719,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -7218,7 +7740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_SSE2",
@@ -7239,7 +7761,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -7269,7 +7791,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_AVX2",
@@ -7290,7 +7812,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -7311,7 +7833,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_SSE2",
@@ -7332,7 +7854,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -7368,7 +7890,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -7392,7 +7914,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_SSE2",
@@ -7416,7 +7938,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -7446,7 +7968,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -7473,7 +8025,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -7488,7 +8040,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_SSSE3",
@@ -7503,7 +8055,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -7521,7 +8073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_X86",
@@ -7539,7 +8091,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -7569,7 +8121,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -7590,7 +8142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_SSE2",
@@ -7611,7 +8163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -7641,7 +8193,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_AVX2",
@@ -7662,7 +8214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_AVX2",
@@ -7683,7 +8235,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_SSSE3",
@@ -7704,7 +8256,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -7725,7 +8277,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_SSSE3",
@@ -7746,7 +8298,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -7773,7 +8325,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -7800,7 +8352,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -7827,7 +8379,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -7860,7 +8412,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_AVX2",
@@ -7881,7 +8433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_AVX2",
@@ -7902,7 +8454,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_SSE2",
@@ -7923,7 +8475,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -7944,7 +8496,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_SSE2",
@@ -7965,7 +8517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -7992,7 +8544,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_AVX2",
@@ -8010,7 +8562,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_AVX2",
@@ -8028,7 +8580,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_SSSE3",
@@ -8046,7 +8598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -8064,7 +8616,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_SSSE3",
@@ -8082,7 +8634,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -8109,7 +8688,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_AVX2",
@@ -8127,7 +8706,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_AVX2",
@@ -8145,7 +8724,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_SSSE3",
@@ -8163,7 +8742,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -8181,7 +8760,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_SSSE3",
@@ -8199,7 +8778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -8226,7 +8805,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_AVX2",
@@ -8244,7 +8823,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_AVX2",
@@ -8262,7 +8841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_SSSE3",
@@ -8280,7 +8859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -8298,7 +8877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_SSSE3",
@@ -8316,7 +8895,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -8343,7 +8922,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_SSE2",
@@ -8361,7 +8940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -8379,7 +8958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_SSE2",
@@ -8397,7 +8976,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -8424,7 +9003,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_SSE2",
@@ -8442,7 +9021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -8460,7 +9039,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_SSE2",
@@ -8478,7 +9057,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -8505,7 +9111,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -8544,7 +9150,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -8583,7 +9234,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -8622,7 +9273,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -8649,7 +9300,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -8688,7 +9339,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -8727,7 +9378,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -8760,7 +9411,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -8793,7 +9444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -8820,7 +9471,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_AVX2",
@@ -8838,7 +9489,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_AVX2",
@@ -8856,7 +9507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_SSSE3",
@@ -8874,7 +9525,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -8892,7 +9543,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_SSSE3",
@@ -8910,7 +9561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -8937,7 +9588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX2",
@@ -8955,7 +9606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX512VBMI",
@@ -8973,7 +9624,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX2",
@@ -8991,7 +9642,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX512VBMI",
@@ -9009,7 +9660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_SSSE3",
@@ -9027,7 +9678,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -9045,7 +9696,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_SSSE3",
@@ -9063,7 +9714,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -9090,7 +9741,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -9120,7 +9771,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_AVX2",
@@ -9134,14 +9785,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_AVX2",
@@ -9162,7 +9813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_SSE2",
@@ -9183,7 +9834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -9197,14 +9848,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_SSE2",
@@ -9218,14 +9869,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_SSE2",
@@ -9243,7 +9894,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -9261,7 +9912,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_SSE2",
@@ -9279,7 +9930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -9306,7 +9957,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_SSSE3",
@@ -9327,7 +9978,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -9348,7 +9999,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_SSSE3",
@@ -9369,7 +10020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_AVX2",
@@ -9393,7 +10044,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_AVX2",
@@ -9417,7 +10068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_SSSE3",
@@ -9441,7 +10092,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -9465,7 +10116,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_SSSE3",
@@ -9489,7 +10140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_AVX2",
@@ -9513,7 +10164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_AVX2",
@@ -9537,7 +10188,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_SSSE3",
@@ -9561,7 +10212,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -9585,7 +10236,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_SSSE3",
@@ -9609,7 +10260,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -9636,7 +10287,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_AVX2",
@@ -9654,7 +10305,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_AVX2",
@@ -9672,7 +10323,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_SSSE3",
@@ -9690,7 +10341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -9708,7 +10359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_SSSE3",
@@ -9726,7 +10377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_AVX2",
@@ -9744,7 +10395,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_AVX2",
@@ -9762,7 +10413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_SSSE3",
@@ -9780,7 +10431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -9798,7 +10449,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_SSSE3",
@@ -9816,7 +10467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -9843,7 +10494,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -9870,7 +10521,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_AVX2",
@@ -9888,7 +10539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_AVX2",
@@ -9906,7 +10557,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_SSE2",
@@ -9924,7 +10575,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -9942,7 +10593,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_SSE2",
@@ -9960,7 +10611,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -9993,7 +10644,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -10026,7 +10677,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -10047,7 +10698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -10068,7 +10719,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -10086,7 +10737,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -10128,7 +10779,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -10170,7 +10821,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -10215,7 +10866,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -10269,7 +10920,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -10326,7 +10977,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -10338,7 +10989,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -10365,7 +11016,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -10404,7 +11055,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_SSSE3",
@@ -10428,7 +11079,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -10452,7 +11103,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_SSSE3",
@@ -10476,7 +11127,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_SSSE3",
@@ -10494,7 +11145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -10512,7 +11163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_SSSE3",
@@ -10530,7 +11181,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -10569,7 +11220,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_AVX2",
@@ -10593,7 +11244,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_AVX2",
@@ -10617,7 +11268,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_SSSE3",
@@ -10641,7 +11292,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -10665,7 +11316,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_SSSE3",
@@ -10689,7 +11340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -10710,7 +11361,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -10731,7 +11382,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -10758,7 +11409,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -10785,7 +11436,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -10797,7 +11448,25 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
+   "source_file" : "external/libyuv/include/libyuv/video_common.h"
+  },
+  {
+   "function_name" : "libyuv::ClampFloatToZero_SSE2",
+   "linker_set_key" : "ClampFloatToZero_SSE2",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -10818,7 +11487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_SSE2",
@@ -10839,7 +11508,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -10857,7 +11526,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -10875,7 +11544,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -10902,7 +11571,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -10932,7 +11601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_AVX2",
@@ -10953,7 +11622,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_AVX2",
@@ -10974,7 +11643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_SSSE3",
@@ -10995,7 +11664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -11016,7 +11685,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_SSSE3",
@@ -11037,7 +11706,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -11067,7 +11736,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_AVX2",
@@ -11088,7 +11757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_AVX2",
@@ -11109,7 +11778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_SSE2",
@@ -11130,7 +11799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -11151,7 +11820,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_SSE2",
@@ -11172,7 +11841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -11214,7 +11883,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -11259,7 +11928,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -11316,7 +11985,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -11346,7 +12015,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -11376,7 +12045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -11403,7 +12072,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -11430,7 +12099,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -11448,7 +12117,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_AVX",
@@ -11466,7 +12135,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_AVX",
@@ -11484,7 +12153,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_SSE2",
@@ -11502,7 +12171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -11520,7 +12189,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_ERMS",
@@ -11538,7 +12207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_SSE2",
@@ -11556,7 +12225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -11574,7 +12243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -11601,7 +12270,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_SSE2",
@@ -11628,7 +12297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -11657,8 +12326,143 @@
      "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_AVX",
+   "linker_set_key" : "DetileRow_16_AVX",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKt"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::DetileRow_16_Any_AVX",
+   "linker_set_key" : "DetileRow_16_Any_AVX",
+   "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_Any_SSE2",
+   "linker_set_key" : "DetileRow_16_Any_SSE2",
+   "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_SSE2",
+   "linker_set_key" : "DetileRow_16_SSE2",
+   "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_Any_SSE2",
@@ -11679,7 +12483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -11700,7 +12504,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_SSE2",
@@ -11721,7 +12525,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -11757,7 +12561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_SSSE3",
@@ -11781,7 +12585,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -11805,7 +12609,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_SSSE3",
@@ -11829,7 +12633,124 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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_SSE2",
+   "linker_set_key" : "DetileToYUY2_Any_SSE2",
+   "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_SSE2",
+   "linker_set_key" : "DetileToYUY2_SSE2",
+   "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::DivideRow_16_AVX2",
@@ -11850,7 +12771,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_AVX2",
@@ -11871,7 +12792,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -11892,7 +12813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -11907,7 +12828,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_X86",
@@ -11922,7 +12843,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -11937,7 +12858,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_X86",
@@ -11952,7 +12873,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -11982,7 +12933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -12009,7 +12960,25 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -12027,13 +12996,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -12072,7 +13041,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -12111,7 +13080,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -12150,7 +13119,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -12189,7 +13158,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -12228,7 +13197,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -12267,7 +13236,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -12306,7 +13275,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -12345,7 +13314,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -12384,7 +13353,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -12423,7 +13392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -12462,7 +13431,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -12501,7 +13470,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -12540,7 +13509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -12579,7 +13548,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -12618,7 +13587,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -12657,7 +13626,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -12696,7 +13665,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -12735,7 +13704,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -12774,7 +13743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -12804,7 +13773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_AVX2",
@@ -12825,7 +13794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_AVX2",
@@ -12846,7 +13815,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_SSE2",
@@ -12867,7 +13836,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -12888,7 +13857,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_SSE2",
@@ -12909,7 +13878,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -12942,7 +13911,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_AVX2",
@@ -12969,7 +13938,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -12996,7 +13965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_SSSE3",
@@ -13023,7 +13992,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_AVX2",
@@ -13041,7 +14010,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -13059,7 +14028,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSE42",
@@ -13077,7 +14046,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSSE3",
@@ -13095,7 +14064,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -13113,7 +14082,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -13131,7 +14100,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_SSE41",
@@ -13149,7 +14118,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -13200,7 +14169,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -13254,7 +14223,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -13305,7 +14274,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -13344,7 +14367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -13383,7 +14406,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -13422,7 +14445,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -13464,7 +14487,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -13509,7 +14532,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -13548,7 +14571,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -13590,7 +14613,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -13635,7 +14658,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -13686,7 +14709,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -13737,7 +14760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -13782,7 +14805,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -13824,7 +14847,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -13866,7 +14889,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -13917,7 +14940,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -13962,7 +14985,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -14013,7 +15036,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -14067,7 +15090,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -14097,7 +15120,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -14148,7 +15171,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -14187,7 +15264,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -14226,7 +15303,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -14265,7 +15342,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -14307,7 +15384,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -14352,7 +15429,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_AVX2",
@@ -14379,7 +15456,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_AVX2",
@@ -14406,7 +15483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_SSSE3",
@@ -14433,7 +15510,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -14460,7 +15537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_SSSE3",
@@ -14487,7 +15564,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -14526,7 +15603,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -14568,7 +15645,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -14613,7 +15690,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_AVX2",
@@ -14640,7 +15717,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_AVX2",
@@ -14667,7 +15744,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_SSSE3",
@@ -14694,7 +15771,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -14721,7 +15798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_SSSE3",
@@ -14748,7 +15825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -14799,7 +15876,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -14850,7 +15927,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -14901,7 +15978,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -14952,7 +16029,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -14997,7 +16074,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_AVX2",
@@ -15024,7 +16101,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_AVX2",
@@ -15051,7 +16128,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_SSSE3",
@@ -15078,7 +16155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -15105,7 +16182,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_SSSE3",
@@ -15132,7 +16209,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_AVX2",
@@ -15159,7 +16236,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_AVX2",
@@ -15186,7 +16263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_SSSE3",
@@ -15213,7 +16290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -15240,7 +16317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_SSSE3",
@@ -15267,7 +16344,58 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -15318,7 +16446,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -15363,7 +16491,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -15390,7 +16518,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -15417,7 +16545,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -15444,7 +16572,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -15474,7 +16602,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_AVX2",
@@ -15495,7 +16623,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_AVX2",
@@ -15516,7 +16644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_SSE2",
@@ -15537,7 +16665,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -15558,7 +16686,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_SSE2",
@@ -15579,7 +16707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -15606,7 +16734,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -15645,7 +16773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -15678,7 +16806,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -15729,7 +16857,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -15759,7 +16887,112 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -15801,7 +17034,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_AVX2",
@@ -15828,7 +17061,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_AVX2",
@@ -15855,7 +17088,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_SSSE3",
@@ -15882,7 +17115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -15909,7 +17142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_SSSE3",
@@ -15936,7 +17169,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -15978,7 +17211,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_AVX2",
@@ -16005,7 +17238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_AVX2",
@@ -16032,7 +17265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_SSSE3",
@@ -16059,7 +17292,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -16086,7 +17319,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_SSSE3",
@@ -16113,7 +17346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -16164,7 +17397,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -16215,7 +17499,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -16266,7 +17601,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -16314,7 +17649,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -16362,7 +17697,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -16413,7 +17748,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -16467,7 +17802,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -16542,7 +17877,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -16593,7 +17928,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -16665,7 +18000,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -16716,7 +18051,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -16767,7 +18102,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -16815,7 +18150,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -16869,7 +18204,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -16929,7 +18264,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -16989,7 +18324,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -17049,7 +18384,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -17100,7 +18435,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -17139,7 +18474,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -17178,7 +18513,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -17217,7 +18552,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -17259,7 +18594,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -17298,7 +18633,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -17337,7 +18672,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -17376,7 +18711,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -17418,7 +18753,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -17463,7 +18798,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -17502,7 +18837,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -17553,7 +18888,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -17604,7 +18939,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -17643,7 +18978,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -17694,7 +19029,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -17745,7 +19080,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -17790,7 +19125,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -17835,7 +19170,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -17874,7 +19209,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -17913,7 +19248,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -17955,7 +19290,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -17994,7 +19374,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -18036,7 +19416,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -18078,7 +19458,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -18117,7 +19497,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -18159,7 +19539,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -18198,7 +19578,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -18237,7 +19617,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -18285,7 +19665,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -18333,7 +19713,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -18384,7 +19764,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -18438,7 +19818,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_AVX2",
@@ -18468,7 +19848,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_AVX2",
@@ -18498,7 +19878,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_SSSE3",
@@ -18528,7 +19908,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -18558,7 +19938,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_SSSE3",
@@ -18588,7 +19968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -18639,7 +20019,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -18693,7 +20073,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -18753,7 +20133,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -18813,7 +20193,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -18873,7 +20253,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -18912,7 +20292,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_AVX2",
@@ -18939,7 +20319,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_AVX2",
@@ -18966,7 +20346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_SSSE3",
@@ -18993,7 +20373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -19020,7 +20400,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_SSSE3",
@@ -19047,7 +20427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -19086,7 +20466,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_AVX2",
@@ -19113,7 +20493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_AVX2",
@@ -19140,7 +20520,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_SSSE3",
@@ -19167,7 +20547,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -19194,7 +20574,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_SSSE3",
@@ -19221,7 +20601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_AVX2",
@@ -19248,7 +20628,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_AVX2",
@@ -19275,7 +20655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_SSSE3",
@@ -19302,7 +20682,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -19329,7 +20709,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_SSSE3",
@@ -19356,7 +20736,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -19398,7 +20778,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -19443,7 +20823,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_AVX2",
@@ -19470,7 +20850,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_AVX2",
@@ -19497,7 +20877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_SSSE3",
@@ -19524,7 +20904,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -19551,7 +20931,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_SSSE3",
@@ -19578,7 +20958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -19617,7 +20997,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -19668,7 +21048,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -19719,7 +21099,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -19770,7 +21150,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -19815,7 +21195,172 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_AVX2",
@@ -19842,7 +21387,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_AVX2",
@@ -19869,7 +21414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_SSSE3",
@@ -19896,7 +21441,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -19923,7 +21468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_SSSE3",
@@ -19950,7 +21495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -19989,7 +21534,49 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_AVX2",
@@ -20016,7 +21603,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_AVX2",
@@ -20043,7 +21630,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_SSSE3",
@@ -20070,7 +21657,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -20097,7 +21684,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_SSSE3",
@@ -20124,7 +21711,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -20163,7 +21750,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -20205,7 +21792,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_AVX2",
@@ -20232,7 +21819,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_AVX2",
@@ -20259,7 +21846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_SSSE3",
@@ -20286,7 +21873,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -20313,7 +21900,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_SSSE3",
@@ -20340,7 +21927,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -20379,7 +21966,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_AVX2",
@@ -20403,7 +21990,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_AVX2",
@@ -20427,7 +22014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_SSE2",
@@ -20451,7 +22038,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -20475,7 +22062,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_SSE2",
@@ -20499,7 +22086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -20538,7 +22125,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_AVX2",
@@ -20562,7 +22149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_AVX2",
@@ -20586,7 +22173,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_SSE2",
@@ -20610,7 +22197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -20634,7 +22221,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_SSE2",
@@ -20658,7 +22245,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -20706,7 +22293,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -20754,7 +22341,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -20805,7 +22392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_AVX2",
@@ -20835,7 +22422,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_AVX2",
@@ -20865,7 +22452,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_SSSE3",
@@ -20895,7 +22482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -20925,7 +22512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_SSSE3",
@@ -20955,7 +22542,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -21006,7 +22593,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -21060,7 +22647,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -21120,7 +22707,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -21180,7 +22767,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -21240,7 +22827,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -21279,7 +22866,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -21318,7 +22905,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -21360,7 +22947,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_AVX2",
@@ -21387,7 +22974,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_AVX2",
@@ -21414,7 +23001,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_SSSE3",
@@ -21441,7 +23028,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -21468,7 +23055,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_SSSE3",
@@ -21495,7 +23082,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -21546,7 +23133,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -21591,7 +23178,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -21636,13 +23223,268 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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_AVX2",
+   "linker_set_key" : "I444ToRGB24Row_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "I444ToRGB24Row_Any_AVX2",
+   "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_Any_SSSE3",
+   "linker_set_key" : "I444ToRGB24Row_Any_SSSE3",
+   "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_SSSE3",
+   "linker_set_key" : "I444ToRGB24Row_SSSE3",
+   "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::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -21678,7 +23520,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -21714,7 +23556,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_AVX2",
@@ -21741,7 +23583,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_Any_AVX2",
@@ -21768,7 +23610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -21795,7 +23637,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -21819,7 +23661,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_AVX2",
@@ -21843,7 +23685,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_AVX2",
@@ -21867,7 +23709,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_SSSE3",
@@ -21891,7 +23733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -21915,7 +23757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_SSSE3",
@@ -21939,7 +23781,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -21966,7 +23808,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_SSE2",
@@ -21984,7 +23826,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -22002,7 +23844,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_SSE2",
@@ -22020,7 +23862,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -22059,7 +23901,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -22098,7 +23940,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -22137,7 +23979,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -22176,7 +24018,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -22215,7 +24057,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -22254,7 +24096,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -22293,7 +24135,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -22332,7 +24174,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -22371,7 +24213,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -22392,7 +24234,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -22425,7 +24267,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -22470,7 +24312,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -22509,7 +24351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -22548,7 +24390,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -22593,7 +24435,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -22632,7 +24474,79 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -22644,7 +24558,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -22692,7 +24606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_AVX2",
@@ -22722,7 +24636,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_AVX2",
@@ -22752,7 +24666,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -22782,7 +24696,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -22830,7 +24744,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_AVX2",
@@ -22860,7 +24774,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_AVX2",
@@ -22890,7 +24804,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -22920,7 +24834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -22965,7 +24879,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_AVX2",
@@ -22992,7 +24906,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_AVX2",
@@ -23019,7 +24933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_SSE2",
@@ -23046,7 +24960,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -23073,7 +24987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_SSE2",
@@ -23100,7 +25014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -23139,7 +25053,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_Any_SSSE3",
@@ -23163,7 +25077,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -23187,7 +25101,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_SSSE3",
@@ -23211,7 +25125,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -23244,7 +25158,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -23280,7 +25194,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_AVX2",
@@ -23304,7 +25218,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_AVX2",
@@ -23328,7 +25242,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -23352,7 +25266,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_AVX2",
@@ -23373,7 +25287,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::MergeUVRow_AVX512BW",
+   "linker_set_key" : "MergeUVRow_AVX512BW",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_AVX2",
@@ -23394,7 +25329,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::MergeUVRow_Any_AVX512BW",
+   "linker_set_key" : "MergeUVRow_Any_AVX512BW",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_SSE2",
@@ -23415,7 +25371,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -23436,7 +25392,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_SSE2",
@@ -23457,7 +25413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -23499,7 +25455,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_AVX2",
@@ -23526,7 +25482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_AVX2",
@@ -23553,7 +25509,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -23580,7 +25536,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_AVX2",
@@ -23607,7 +25563,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_AVX2",
@@ -23634,7 +25590,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -23661,7 +25617,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_AVX2",
@@ -23688,7 +25644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_AVX2",
@@ -23715,7 +25671,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -23742,7 +25698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_AVX2",
@@ -23766,7 +25722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_AVX2",
@@ -23790,7 +25746,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_SSE2",
@@ -23814,7 +25770,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -23838,7 +25794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_SSE2",
@@ -23862,7 +25818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -23874,7 +25830,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -23901,7 +25857,25 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MirrorRow_AVX2",
@@ -23919,7 +25893,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_AVX2",
@@ -23937,7 +25911,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_SSSE3",
@@ -23955,7 +25929,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -23973,7 +25947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_SSSE3",
@@ -23991,7 +25965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -24012,7 +25986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_SSSE3",
@@ -24033,7 +26007,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -24060,7 +26034,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_AVX2",
@@ -24078,7 +26052,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_AVX2",
@@ -24096,7 +26070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_SSSE3",
@@ -24114,7 +26088,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -24132,7 +26106,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_SSSE3",
@@ -24150,7 +26124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_AVX2",
@@ -24171,7 +26145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_AVX2",
@@ -24192,7 +26166,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -24213,7 +26187,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -24252,7 +26226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -24291,7 +26265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -24339,7 +26313,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -24372,7 +26346,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -24405,7 +26379,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -24441,7 +26415,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_AVX2",
@@ -24465,7 +26439,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_AVX2",
@@ -24489,7 +26463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_SSSE3",
@@ -24513,7 +26487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -24537,7 +26511,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_SSSE3",
@@ -24561,7 +26535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -24606,7 +26580,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -24654,7 +26628,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -24693,7 +26667,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -24726,7 +26700,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -24759,7 +26733,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -24795,7 +26769,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_AVX2",
@@ -24819,7 +26793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_AVX2",
@@ -24843,7 +26817,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_SSSE3",
@@ -24867,7 +26841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -24891,7 +26865,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_SSSE3",
@@ -24915,7 +26889,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -24948,7 +26922,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -24984,7 +26958,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_AVX2",
@@ -25008,7 +26982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_AVX2",
@@ -25032,7 +27006,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_SSSE3",
@@ -25056,7 +27030,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -25080,7 +27054,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_SSSE3",
@@ -25104,7 +27078,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -25143,7 +27117,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -25182,7 +27156,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -25215,7 +27189,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -25248,7 +27222,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -25284,7 +27258,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_AVX2",
@@ -25308,7 +27282,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_AVX2",
@@ -25332,7 +27306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_SSSE3",
@@ -25356,7 +27330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -25380,7 +27354,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_SSSE3",
@@ -25404,7 +27378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -25449,7 +27423,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -25488,7 +27462,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -25521,7 +27495,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -25554,7 +27528,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -25590,7 +27564,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_AVX2",
@@ -25614,7 +27588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_AVX2",
@@ -25638,7 +27612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_SSSE3",
@@ -25662,7 +27636,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -25686,7 +27660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_SSSE3",
@@ -25710,7 +27684,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -25743,7 +27717,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_AVX2",
@@ -25764,7 +27738,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_AVX2",
@@ -25785,7 +27759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_SSSE3",
@@ -25806,7 +27780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -25827,7 +27801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_SSSE3",
@@ -25848,7 +27822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -25884,7 +27858,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -25923,7 +27897,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -25959,7 +27933,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -25998,7 +27972,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -26037,7 +28056,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -26073,7 +28137,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -26112,7 +28176,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_AVX2",
@@ -26136,7 +28200,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_AVX2",
@@ -26160,7 +28224,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_SSSE3",
@@ -26184,7 +28248,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -26208,7 +28272,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_SSSE3",
@@ -26232,7 +28296,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -26268,7 +28332,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -26307,7 +28371,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_AVX2",
@@ -26331,7 +28395,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_AVX2",
@@ -26355,7 +28419,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_SSSE3",
@@ -26379,7 +28443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -26403,7 +28467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_SSSE3",
@@ -26427,7 +28491,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -26466,7 +28530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_AVX2",
@@ -26490,7 +28554,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_AVX2",
@@ -26514,7 +28578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_SSSE3",
@@ -26538,7 +28602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -26562,7 +28626,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_SSSE3",
@@ -26586,7 +28650,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_AVX2",
@@ -26610,7 +28674,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_AVX2",
@@ -26634,7 +28698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_SSSE3",
@@ -26658,7 +28722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -26682,7 +28746,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_SSSE3",
@@ -26706,7 +28770,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -26733,7 +28797,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_SSSE3",
@@ -26751,7 +28815,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -26769,7 +28833,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_SSSE3",
@@ -26787,7 +28851,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -26826,7 +28890,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -26853,7 +28917,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -26892,7 +28956,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -26925,7 +28989,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -26952,7 +29016,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_SSSE3",
@@ -26970,7 +29034,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -26988,7 +29052,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_SSSE3",
@@ -27006,7 +29070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -27033,7 +29097,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_SSSE3",
@@ -27051,7 +29115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -27069,7 +29133,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_SSSE3",
@@ -27087,7 +29151,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -27111,7 +29175,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -27135,7 +29199,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_AVX2",
@@ -27153,7 +29217,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_AVX2",
@@ -27171,7 +29235,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_SSSE3",
@@ -27189,7 +29253,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -27207,7 +29271,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_SSSE3",
@@ -27225,7 +29289,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -27243,7 +29307,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -27270,7 +29334,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_SSSE3",
@@ -27288,7 +29352,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -27306,7 +29370,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_SSSE3",
@@ -27324,7 +29388,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -27351,7 +29415,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_SSSE3",
@@ -27369,7 +29433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -27387,7 +29451,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_SSSE3",
@@ -27405,7 +29469,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -27444,7 +29508,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -27471,7 +29535,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -27510,7 +29574,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -27534,7 +29598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -27558,7 +29622,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_AVX2",
@@ -27576,7 +29640,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_AVX2",
@@ -27594,7 +29658,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_SSSE3",
@@ -27612,7 +29676,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -27630,7 +29694,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_SSSE3",
@@ -27648,7 +29712,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -27666,7 +29730,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -27693,7 +29757,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_SSE2",
@@ -27711,7 +29775,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -27729,7 +29793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_SSE2",
@@ -27747,7 +29811,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -27786,7 +29850,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -27810,7 +29874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -27828,7 +29892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -27855,7 +29919,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -27894,7 +29958,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -27921,7 +29985,31 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_SSSE3",
@@ -27945,7 +30033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -27969,7 +30057,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_SSSE3",
@@ -27993,7 +30081,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_AVX2",
@@ -28011,7 +30099,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_AVX2",
@@ -28029,7 +30117,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_SSSE3",
@@ -28047,7 +30135,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -28065,7 +30153,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_SSSE3",
@@ -28083,7 +30171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_SSSE3",
@@ -28101,7 +30189,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -28119,7 +30207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_SSSE3",
@@ -28137,7 +30225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -28167,7 +30255,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -28197,7 +30285,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -28215,7 +30303,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_X86",
@@ -28233,7 +30321,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -28269,7 +30357,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -28299,7 +30399,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -28326,7 +30426,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -28353,7 +30453,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -28380,7 +30480,37 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "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"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -28440,7 +30570,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -28464,7 +30594,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -28488,7 +30618,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_SSE2",
@@ -28512,7 +30642,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -28536,7 +30666,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_SSE2",
@@ -28560,7 +30690,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -28584,7 +30714,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -28608,7 +30738,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_SSSE3",
@@ -28632,7 +30762,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_SSE2",
@@ -28653,7 +30783,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -28674,7 +30804,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_SSE2",
@@ -28695,7 +30825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_SSE2",
@@ -28716,7 +30846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -28737,7 +30867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_SSE2",
@@ -28758,7 +30888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_SSE2",
@@ -28779,7 +30909,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -28800,7 +30930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_SSE2",
@@ -28821,7 +30951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_SSE2",
@@ -28845,7 +30975,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -28869,7 +30999,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_SSE2",
@@ -28893,7 +31023,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_SSE2",
@@ -28917,7 +31047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -28941,7 +31071,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_SSE2",
@@ -28965,7 +31095,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -28983,7 +31113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_AVX2",
@@ -29001,7 +31131,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_AVX2",
@@ -29019,7 +31149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_SSE2",
@@ -29037,7 +31167,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -29055,7 +31185,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_SSE2",
@@ -29073,7 +31203,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -29097,7 +31227,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -29121,7 +31251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_SSE2",
@@ -29145,7 +31275,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -29169,7 +31299,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -29193,7 +31323,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -29217,7 +31347,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -29241,7 +31371,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -29265,7 +31395,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -29289,7 +31419,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_SSSE3",
@@ -29313,7 +31443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -29337,7 +31467,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -29358,7 +31488,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -29394,7 +31524,46 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -29439,7 +31608,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -29484,7 +31653,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -29532,7 +31701,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -29568,7 +31737,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -29604,7 +31773,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -29625,7 +31842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_AVX2",
@@ -29646,7 +31863,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_AVX2",
@@ -29667,7 +31884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_SSSE3",
@@ -29688,7 +31905,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -29709,7 +31926,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_AVX2",
@@ -29730,7 +31947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -29751,7 +31968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_SSSE3",
@@ -29772,7 +31989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_SSSE3",
@@ -29793,7 +32010,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -29814,7 +32079,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_AVX2",
@@ -29835,7 +32100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_AVX2",
@@ -29856,7 +32121,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_SSSE3",
@@ -29877,7 +32142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -29898,7 +32163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_SSSE3",
@@ -29919,7 +32184,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -29940,7 +32253,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_AVX2",
@@ -29961,7 +32274,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_AVX2",
@@ -29982,7 +32295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_SSSE3",
@@ -30003,7 +32316,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -30024,7 +32337,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_SSSE3",
@@ -30045,7 +32358,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -30066,7 +32379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_SSSE3",
@@ -30087,7 +32400,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -30108,7 +32421,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_SSSE3",
@@ -30129,7 +32442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -30150,7 +32463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -30171,7 +32484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_SSSE3",
@@ -30192,7 +32505,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -30213,7 +32526,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_SSSE3",
@@ -30234,7 +32547,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_SSSE3",
@@ -30255,7 +32568,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -30276,7 +32589,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_SSSE3",
@@ -30297,7 +32610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -30318,7 +32631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -30339,7 +32652,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_SSSE3",
@@ -30360,7 +32673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -30381,7 +32694,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_SSSE3",
@@ -30402,7 +32715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -30423,7 +32736,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_SSSE3",
@@ -30444,7 +32757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -30465,7 +32778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_SSSE3",
@@ -30486,7 +32799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_SSSE3",
@@ -30507,7 +32820,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -30528,7 +32841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_SSSE3",
@@ -30549,7 +32862,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -30570,7 +32883,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_AVX2",
@@ -30591,7 +32904,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_AVX2",
@@ -30612,7 +32925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_SSSE3",
@@ -30633,7 +32946,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -30654,7 +32967,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_SSSE3",
@@ -30675,7 +32988,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -30696,7 +33009,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_AVX2",
@@ -30717,7 +33030,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_AVX2",
@@ -30738,7 +33051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_SSSE3",
@@ -30759,7 +33072,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -30780,7 +33093,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_SSSE3",
@@ -30801,7 +33114,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_AVX2",
@@ -30825,7 +33138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_AVX2",
@@ -30849,7 +33162,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_SSSE3",
@@ -30873,7 +33186,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_SSSE3",
@@ -30897,7 +33210,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_AVX2",
@@ -30921,7 +33234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_AVX2",
@@ -30945,7 +33258,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -30969,7 +33282,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_SSE2",
@@ -30993,7 +33306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -31017,7 +33330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_SSE2",
@@ -31041,7 +33354,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_AVX2",
@@ -31065,7 +33378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_AVX2",
@@ -31089,7 +33402,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -31113,7 +33426,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSE2",
@@ -31137,7 +33450,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSSE3",
@@ -31161,7 +33474,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -31185,7 +33498,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSE2",
@@ -31209,7 +33522,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSSE3",
@@ -31233,7 +33546,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_AVX2",
@@ -31251,7 +33564,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_AVX2",
@@ -31269,7 +33582,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_SSSE3",
@@ -31287,7 +33600,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_SSSE3",
@@ -31305,7 +33618,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_AVX2",
@@ -31323,7 +33636,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_AVX2",
@@ -31341,7 +33654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -31359,7 +33672,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_SSE2",
@@ -31377,7 +33690,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -31395,7 +33708,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_SSE2",
@@ -31413,7 +33726,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_AVX2",
@@ -31431,7 +33744,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_AVX2",
@@ -31449,7 +33762,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -31467,7 +33780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSE2",
@@ -31485,7 +33798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSSE3",
@@ -31503,7 +33816,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -31521,7 +33834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSE2",
@@ -31539,7 +33852,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSSE3",
@@ -31557,7 +33870,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -31578,7 +33891,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -31614,7 +33927,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -31635,7 +33948,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -31659,7 +33972,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -31683,7 +33996,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -31707,7 +34020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -31731,7 +34044,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -31755,7 +34068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_AVX2",
@@ -31776,7 +34089,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_AVX2",
@@ -31797,7 +34110,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_SSSE3",
@@ -31818,7 +34131,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -31839,7 +34152,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_SSSE3",
@@ -31860,7 +34173,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -31881,7 +34194,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -31902,7 +34215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -31926,7 +34239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -31950,7 +34263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_AVX2",
@@ -31974,7 +34287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_AVX2",
@@ -31998,7 +34311,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -32022,7 +34335,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_SSE41",
@@ -32046,7 +34359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -32070,7 +34383,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_SSE41",
@@ -32094,7 +34407,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_AVX2",
@@ -32118,7 +34431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_AVX2",
@@ -32142,7 +34455,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -32166,7 +34479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_SSSE3",
@@ -32190,7 +34503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -32214,7 +34527,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_SSSE3",
@@ -32238,7 +34551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_AVX2",
@@ -32256,7 +34569,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_AVX2",
@@ -32274,7 +34587,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -32292,7 +34605,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_SSE41",
@@ -32310,7 +34623,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -32328,7 +34641,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_SSE41",
@@ -32346,7 +34659,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_AVX2",
@@ -32364,7 +34677,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_AVX2",
@@ -32382,7 +34695,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -32400,7 +34713,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_SSSE3",
@@ -32418,7 +34731,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -32436,7 +34749,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_SSSE3",
@@ -32454,7 +34767,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -32478,7 +34791,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_X86",
@@ -32496,7 +34809,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -32514,7 +34827,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_ERMS",
@@ -32532,7 +34845,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_X86",
@@ -32550,7 +34863,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_SSE2",
@@ -32571,7 +34884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -32592,7 +34905,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_SSE2",
@@ -32613,7 +34926,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_SSE2",
@@ -32634,7 +34947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -32655,7 +34968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_SSE2",
@@ -32676,7 +34989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -32700,7 +35013,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_SSE2",
@@ -32724,7 +35037,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_SSE2",
@@ -32745,7 +35058,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -32766,7 +35079,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_SSE2",
@@ -32787,7 +35100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -32808,7 +35121,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_SSE2",
@@ -32829,7 +35142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -32874,7 +35187,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_AVX2",
@@ -32901,7 +35214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_AVX2",
@@ -32928,7 +35241,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSE2",
@@ -32955,7 +35268,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSSE3",
@@ -32982,7 +35295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -33009,7 +35322,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSE2",
@@ -33036,7 +35349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSSE3",
@@ -33063,7 +35376,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -33102,7 +35415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_SSSE3",
@@ -33126,7 +35439,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -33150,7 +35463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_SSSE3",
@@ -33174,7 +35487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -33210,7 +35523,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -33243,7 +35556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -33276,7 +35589,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -33309,7 +35622,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -33342,7 +35655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -33375,7 +35688,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -33411,7 +35724,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_AVX2",
@@ -33435,7 +35748,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_AVX2",
@@ -33459,7 +35772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -33483,7 +35796,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_AVX2",
@@ -33504,7 +35817,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_AVX2",
@@ -33525,7 +35838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_SSE2",
@@ -33546,7 +35859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -33567,7 +35880,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_SSE2",
@@ -33588,7 +35901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_AVX2",
@@ -33612,7 +35925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_AVX2",
@@ -33636,7 +35949,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSE2",
@@ -33660,7 +35973,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSSE3",
@@ -33684,7 +35997,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -33708,7 +36021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSE2",
@@ -33732,7 +36045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSSE3",
@@ -33756,7 +36069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -33771,7 +36084,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -33789,7 +36102,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_SSE2",
@@ -33807,7 +36120,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -33834,7 +36147,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_AVX2",
@@ -33852,7 +36165,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_AVX2",
@@ -33870,7 +36183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_SSSE3",
@@ -33888,7 +36201,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -33906,7 +36219,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_SSSE3",
@@ -33924,7 +36237,79 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::Transpose4x4_32_AVX2",
+   "linker_set_key" : "Transpose4x4_32_AVX2",
+   "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_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_SSE2",
+   "linker_set_key" : "Transpose4x4_32_SSE2",
+   "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::TransposePlane",
@@ -33951,7 +36336,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -33981,7 +36366,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -34014,7 +36399,31 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_SSSE3",
@@ -34038,7 +36447,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -34062,7 +36471,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_SSSE3",
@@ -34086,7 +36495,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -34113,7 +36549,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -34152,7 +36588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -34191,7 +36627,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -34230,7 +36666,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -34269,7 +36705,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -34308,7 +36744,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -34347,7 +36783,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -34386,7 +36822,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -34425,7 +36861,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -34464,7 +36900,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -34503,7 +36939,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -34542,7 +36978,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -34581,7 +37017,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -34620,7 +37056,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -34659,7 +37095,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -34686,7 +37122,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_AVX2",
@@ -34707,7 +37143,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_AVX2",
@@ -34728,7 +37164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_SSSE3",
@@ -34749,7 +37185,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -34770,7 +37206,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_SSSE3",
@@ -34791,7 +37227,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -34830,7 +37266,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -34869,7 +37305,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -34902,7 +37338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_AVX2",
@@ -34923,7 +37359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_AVX2",
@@ -34944,7 +37380,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_SSE2",
@@ -34965,7 +37401,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -34986,7 +37422,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_SSE2",
@@ -35007,7 +37443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_AVX2",
@@ -35031,7 +37467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_AVX2",
@@ -35055,7 +37491,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_SSE2",
@@ -35079,7 +37515,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -35103,7 +37539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_SSE2",
@@ -35127,7 +37563,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -35154,7 +37590,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_AVX2",
@@ -35172,7 +37608,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_AVX2",
@@ -35190,7 +37626,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_SSE2",
@@ -35208,7 +37644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -35226,7 +37662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_SSE2",
@@ -35244,7 +37680,25 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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::ValidateJpeg",
@@ -35259,7 +37713,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -35286,7 +37740,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_AVX2",
@@ -35307,7 +37761,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_AVX2",
@@ -35328,7 +37782,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_SSSE3",
@@ -35349,7 +37803,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -35370,7 +37824,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_SSSE3",
@@ -35391,7 +37845,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -35430,7 +37884,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -35469,7 +37923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -35502,7 +37956,112 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+  },
+  {
+   "function_name" : "libyuv::YUY2ToNVUVRow_AVX2",
+   "linker_set_key" : "YUY2ToNVUVRow_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "YUY2ToNVUVRow_Any_AVX2",
+   "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_Any_SSE2",
+   "linker_set_key" : "YUY2ToNVUVRow_Any_SSE2",
+   "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_SSE2",
+   "linker_set_key" : "YUY2ToNVUVRow_SSE2",
+   "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::YUY2ToUV422Row_AVX2",
@@ -35523,7 +38082,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_AVX2",
@@ -35544,7 +38103,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_SSE2",
@@ -35565,7 +38124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -35586,7 +38145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_SSE2",
@@ -35607,7 +38166,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_AVX2",
@@ -35631,7 +38190,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_AVX2",
@@ -35655,7 +38214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_SSE2",
@@ -35679,7 +38238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -35703,7 +38262,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_SSE2",
@@ -35727,7 +38286,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -35754,7 +38313,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_AVX2",
@@ -35772,7 +38331,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_AVX2",
@@ -35790,7 +38349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_SSE2",
@@ -35808,7 +38367,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -35826,7 +38385,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_SSE2",
@@ -35844,7 +38403,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -35858,7 +38417,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -35871,7 +38430,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -35885,7 +38444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -35898,7 +38457,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -35920,7 +38479,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -35945,7 +38504,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -35961,7 +38520,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -35974,7 +38533,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -35990,7 +38549,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -36006,7 +38565,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -36023,7 +38582,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -36039,7 +38598,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -36055,7 +38614,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -36071,7 +38630,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -36088,7 +38647,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -36102,7 +38661,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -36118,7 +38677,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -36134,7 +38693,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -36152,7 +38711,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -36165,7 +38724,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -36181,7 +38740,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -36194,7 +38753,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -36207,7 +38766,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -36226,7 +38785,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -36239,7 +38798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -36252,7 +38811,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -36265,7 +38824,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -36278,7 +38837,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -36287,121 +38846,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -36414,7 +38973,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36423,7 +38982,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36432,7 +38991,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -36441,7 +39000,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36450,7 +39009,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -36459,7 +39018,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36468,7 +39027,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -36477,7 +39036,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -36486,7 +39045,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -36495,7 +39054,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -36504,7 +39063,16 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "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"
   },
   {
    "alignment" : 4,
@@ -36513,7 +39081,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -36522,7 +39090,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36531,7 +39099,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36540,7 +39108,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36549,7 +39117,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36558,7 +39126,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36567,7 +39135,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -36576,7 +39144,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -36585,7 +39153,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36594,7 +39162,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -36603,7 +39171,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -36612,7 +39180,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -36625,7 +39193,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 2,
@@ -36635,7 +39203,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -36645,7 +39213,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -36655,7 +39223,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -36665,7 +39233,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -36675,7 +39243,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -36685,7 +39253,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -36695,7 +39263,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -36705,7 +39273,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -36715,7 +39283,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -36744,7 +39312,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 12,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36822,7 +39390,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 56,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -36858,7 +39426,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -36879,7 +39447,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/34/64/x86_64/source-based/android.hardware.audio.common@2.0.so.lsdump b/34/64/x86_64/source-based/android.hardware.audio.common@2.0.so.lsdump
index e5ed02c..7fde65d 100644
--- a/34/64/x86_64/source-based/android.hardware.audio.common@2.0.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.audio.common@2.0.so.lsdump
@@ -2667,7 +2667,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"
     },
     {
@@ -2807,119 +2807,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2936,7 +2936,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3084,7 +3084,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -3665,7 +3665,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -3889,39 +3889,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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/x86_64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump b/34/64/x86_64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
index 4b44d43..daad1f5 100644
--- a/34/64/x86_64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
@@ -645,7 +645,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -653,7 +653,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump b/34/64/x86_64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
index 81e1952..cb03049 100644
--- a/34/64/x86_64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
@@ -3690,11 +3690,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump b/34/64/x86_64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
index b73dcd2..a338461 100644
--- a/34/64/x86_64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
@@ -3684,11 +3684,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -4275,11 +4275,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4860,11 +4860,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump b/34/64/x86_64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
index 13f9611..ed23b9a 100644
--- a/34/64/x86_64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
@@ -572,7 +572,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -580,7 +580,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_64/source-based/android.hardware.graphics.common@1.0.so.lsdump b/34/64/x86_64/source-based/android.hardware.graphics.common@1.0.so.lsdump
index 805319d..0f79c8d 100644
--- a/34/64/x86_64/source-based/android.hardware.graphics.common@1.0.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.graphics.common@1.0.so.lsdump
@@ -2856,11 +2856,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_64/source-based/android.hardware.graphics.common@1.1.so.lsdump b/34/64/x86_64/source-based/android.hardware.graphics.common@1.1.so.lsdump
index 996c09e..9feffb4 100644
--- a/34/64/x86_64/source-based/android.hardware.graphics.common@1.1.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.graphics.common@1.1.so.lsdump
@@ -2856,11 +2856,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3447,11 +3447,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_64/source-based/android.hardware.graphics.common@1.2.so.lsdump b/34/64/x86_64/source-based/android.hardware.graphics.common@1.2.so.lsdump
index fe2700f..b45e212 100644
--- a/34/64/x86_64/source-based/android.hardware.graphics.common@1.2.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.graphics.common@1.2.so.lsdump
@@ -2873,11 +2873,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3464,11 +3464,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4049,11 +4049,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump b/34/64/x86_64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
index cc44d12..672a6f7 100644
--- a/34/64/x86_64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
@@ -3230,11 +3230,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump b/34/64/x86_64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
index d68c861..08d4f49 100644
--- a/34/64/x86_64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
@@ -3228,11 +3228,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3819,11 +3819,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump b/34/64/x86_64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
index bc14939..40b1a66 100644
--- a/34/64/x86_64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
@@ -3266,11 +3266,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3857,11 +3857,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4442,11 +4442,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump b/34/64/x86_64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
index 4522d5f..33f4976 100644
--- a/34/64/x86_64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
@@ -3362,11 +3362,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3953,11 +3953,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4538,11 +4538,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_64/source-based/android.hardware.media.omx@1.0.so.lsdump b/34/64/x86_64/source-based/android.hardware.media.omx@1.0.so.lsdump
index d760641..91791fb 100644
--- a/34/64/x86_64/source-based/android.hardware.media.omx@1.0.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.media.omx@1.0.so.lsdump
@@ -5060,11 +5060,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_64/source-based/android.hardware.media@1.0.so.lsdump b/34/64/x86_64/source-based/android.hardware.media@1.0.so.lsdump
index e00a284..4725104 100644
--- a/34/64/x86_64/source-based/android.hardware.media@1.0.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.media@1.0.so.lsdump
@@ -2864,11 +2864,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_64/source-based/android.hardware.soundtrigger@2.0.so.lsdump b/34/64/x86_64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
index 410ea9f..454fc1b 100644
--- a/34/64/x86_64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
+++ b/34/64/x86_64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
@@ -3418,7 +3418,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"
     },
     {
@@ -3558,119 +3558,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3687,7 +3687,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3835,7 +3835,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -4416,7 +4416,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -4640,39 +4640,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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump b/34/64/x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
index f112a5c..225bee1 100644
--- a/34/64/x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/34/64/x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -978,6 +978,31 @@
    "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_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIm"
+  },
+  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -18199,7 +18224,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -18208,7 +18233,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -18223,7 +18248,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -18232,7 +18257,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -18247,7 +18272,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -18256,7 +18281,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -18271,7 +18296,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -18280,7 +18305,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -40060,7 +40085,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -45030,7 +45055,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -45070,7 +45095,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -45080,7 +45105,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -45090,7 +45115,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -46025,7 +46050,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -46034,7 +46059,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -46126,7 +46151,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -46135,7 +46160,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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/x86_64/source-based/android.hidl.token@1.0-utils.so.lsdump b/34/64/x86_64/source-based/android.hidl.token@1.0-utils.so.lsdump
index b72a37d..1f1ca11 100644
--- a/34/64/x86_64/source-based/android.hidl.token@1.0-utils.so.lsdump
+++ b/34/64/x86_64/source-based/android.hidl.token@1.0-utils.so.lsdump
@@ -5964,6 +5964,12 @@
     },
     {
      "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/x86_64/source-based/config.json b/34/64/x86_64/source-based/config.json
index 403b4cf..5da2c2b 100644
--- a/34/64/x86_64/source-based/config.json
+++ b/34/64/x86_64/source-based/config.json
@@ -1,4 +1,9 @@
 {
+  "global": {
+    "flags": {
+      "advice_only": true
+    }
+  },
   "libbinder": [
     {
       "target_version": "current",
diff --git a/34/64/x86_64/source-based/libRSCpuRef.so.lsdump b/34/64/x86_64/source-based/libRSCpuRef.so.lsdump
index fdf419f..2edfc33 100644
--- a/34/64/x86_64/source-based/libRSCpuRef.so.lsdump
+++ b/34/64/x86_64/source-based/libRSCpuRef.so.lsdump
@@ -70,7 +70,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA12_m",
    "size" : 96,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -196,7 +196,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -331,7 +331,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -655,7 +655,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -673,7 +673,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 56,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -691,7 +691,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -3692,6 +3692,83 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "_CMPCCX_O"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "_CMPCCX_NO"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "_CMPCCX_B"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "_CMPCCX_NB"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "_CMPCCX_Z"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "_CMPCCX_NZ"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "_CMPCCX_BE"
+    },
+    {
+     "enum_field_value" : 7,
+     "name" : "_CMPCCX_NBE"
+    },
+    {
+     "enum_field_value" : 8,
+     "name" : "_CMPCCX_S"
+    },
+    {
+     "enum_field_value" : 9,
+     "name" : "_CMPCCX_NS"
+    },
+    {
+     "enum_field_value" : 10,
+     "name" : "_CMPCCX_P"
+    },
+    {
+     "enum_field_value" : 11,
+     "name" : "_CMPCCX_NP"
+    },
+    {
+     "enum_field_value" : 12,
+     "name" : "_CMPCCX_L"
+    },
+    {
+     "enum_field_value" : 13,
+     "name" : "_CMPCCX_NL"
+    },
+    {
+     "enum_field_value" : 14,
+     "name" : "_CMPCCX_LE"
+    },
+    {
+     "enum_field_value" : 15,
+     "name" : "_CMPCCX_NLE"
+    }
+   ],
+   "linker_set_key" : "_ZTI12_CMPCCX_ENUM",
+   "name" : "_CMPCCX_ENUM",
+   "referenced_type" : "_ZTI12_CMPCCX_ENUM",
+   "self_type" : "_ZTI12_CMPCCX_ENUM",
+   "size" : 4,
+   "source_file" : "prebuilts/clang-tools/linux-x86/clang-headers/cmpccxaddintrin.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "RS_CONTEXT_TYPE_NORMAL"
     },
     {
@@ -7077,7 +7154,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -7093,11 +7170,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -7106,7 +7183,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7355,6 +7432,31 @@
    "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_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIm"
+  },
+  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -11006,7 +11108,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11024,7 +11126,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11057,7 +11159,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11072,7 +11174,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11090,7 +11192,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11108,7 +11210,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11135,7 +11237,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11171,7 +11273,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11189,7 +11291,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11210,7 +11312,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11234,7 +11336,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11270,7 +11372,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11309,7 +11411,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11345,7 +11447,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11384,7 +11486,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11417,7 +11519,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11435,7 +11537,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11552,7 +11654,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11573,7 +11675,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23738,7 +23840,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23747,7 +23849,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23801,7 +23903,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -23819,7 +23921,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -23927,7 +24029,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23936,7 +24038,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -24287,7 +24389,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24296,7 +24398,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24305,7 +24407,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24314,7 +24416,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -24323,7 +24425,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -24332,7 +24434,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -24341,7 +24443,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -24359,7 +24461,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24368,7 +24470,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24377,7 +24479,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24386,7 +24488,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24395,7 +24497,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24404,7 +24506,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24413,7 +24515,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24422,7 +24524,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24431,7 +24533,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24440,7 +24542,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24503,7 +24605,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -24512,7 +24614,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -25070,7 +25172,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -25115,7 +25217,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -25124,7 +25226,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -25274,8 +25376,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_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -25724,8 +25826,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_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -31784,7 +31886,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -31838,7 +31940,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -32563,7 +32665,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -32613,7 +32715,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -32623,7 +32725,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36326,7 +36428,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_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 8,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -37790,7 +37892,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -37846,7 +37948,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 16,
@@ -38775,7 +38877,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -39142,7 +39244,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -39747,7 +39849,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -39884,7 +39986,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -48271,7 +48373,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48352,7 +48454,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -49127,7 +49229,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -49144,7 +49246,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -49154,7 +49256,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -49171,7 +49273,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -58325,7 +58427,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -58334,7 +58436,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -58349,7 +58451,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -58358,7 +58460,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -58373,7 +58475,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -58382,7 +58484,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -58397,7 +58499,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -58406,7 +58508,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -131405,7 +131507,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -131414,7 +131516,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "size" : 1,
@@ -131432,7 +131534,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
-   "name" : "std::__make_tuple_indices<2, 0>",
+   "name" : "std::__make_tuple_indices<2>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm2ELm0EEE",
    "size" : 1,
@@ -153460,7 +153562,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -153500,7 +153602,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -153510,7 +153612,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -153520,7 +153622,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -153623,7 +153725,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -153737,7 +153839,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -153851,7 +153953,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -153950,7 +154052,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -154921,7 +155023,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -154930,7 +155032,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -155022,7 +155124,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -155031,7 +155133,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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/x86_64/source-based/libRSDriver.so.lsdump b/34/64/x86_64/source-based/libRSDriver.so.lsdump
index c5a6fbc..c4addde 100644
--- a/34/64/x86_64/source-based/libRSDriver.so.lsdump
+++ b/34/64/x86_64/source-based/libRSDriver.so.lsdump
@@ -5794,7 +5794,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5810,71 +5810,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -6082,6 +6082,31 @@
    "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_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIm"
+  },
+  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -10444,7 +10469,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10468,7 +10493,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11155,7 +11180,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -25088,8 +25113,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_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -30937,7 +30962,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -69234,7 +69259,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
diff --git a/34/64/x86_64/source-based/libRS_internal.so.lsdump b/34/64/x86_64/source-based/libRS_internal.so.lsdump
index d928ba2..9910760 100644
--- a/34/64/x86_64/source-based/libRS_internal.so.lsdump
+++ b/34/64/x86_64/source-based/libRS_internal.so.lsdump
@@ -8321,7 +8321,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -8337,71 +8337,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -8589,6 +8589,31 @@
    "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_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIm"
+  },
+  {
    "alignment" : 4,
    "enum_fields" :
    [
@@ -31987,7 +32012,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_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
@@ -37879,8 +37904,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_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 8,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -38122,8 +38147,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_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38131,8 +38156,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_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38140,8 +38165,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_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38149,8 +38174,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_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 8,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -74751,7 +74776,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -74760,7 +74785,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -74775,7 +74800,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -74784,7 +74809,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -74799,7 +74824,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -74808,7 +74833,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -74823,7 +74848,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -74832,7 +74857,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -127474,7 +127499,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -141268,7 +141293,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -141411,7 +141436,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -149124,7 +149149,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -158677,7 +158702,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -158717,7 +158742,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -158727,7 +158752,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -158737,7 +158762,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -159620,7 +159645,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -159629,7 +159654,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -159721,7 +159746,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -159730,7 +159755,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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/x86_64/source-based/libaudioutils.so.lsdump b/34/64/x86_64/source-based/libaudioutils.so.lsdump
index 7f19ab2..456426e 100644
--- a/34/64/x86_64/source-based/libaudioutils.so.lsdump
+++ b/34/64/x86_64/source-based/libaudioutils.so.lsdump
@@ -1760,6 +1760,14 @@
   },
   {
    "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"
   },
   {
@@ -2967,7 +2975,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3205,119 +3213,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -2080374784,
+     "enum_field_value" : 2214592512,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : -2013265920,
+     "enum_field_value" : 2281701376,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : -2013265919,
+     "enum_field_value" : 2281701377,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : -1879048192,
+     "enum_field_value" : 2415919104,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : -1610612736,
+     "enum_field_value" : 2684354560,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3329,15 +3337,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4140,15 +4148,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -551550977,
+     "enum_field_value" : 3743416319,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4630,99 +4638,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : -2147483137,
+     "enum_field_value" : 2147484159,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : -2147482625,
+     "enum_field_value" : 2147484671,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : -2147481601,
+     "enum_field_value" : 2147485695,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : -2147479553,
+     "enum_field_value" : 2147487743,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : -2147475457,
+     "enum_field_value" : 2147491839,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : -2147467265,
+     "enum_field_value" : 2147500031,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : -2147450881,
+     "enum_field_value" : 2147516415,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : -2147418113,
+     "enum_field_value" : 2147549183,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : -2147352577,
+     "enum_field_value" : 2147614719,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : -2147221505,
+     "enum_field_value" : 2147745791,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : -2146959361,
+     "enum_field_value" : 2148007935,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : -2146435073,
+     "enum_field_value" : 2148532223,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : -2145386497,
+     "enum_field_value" : 2149580799,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : -2143289345,
+     "enum_field_value" : 2151677951,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : -2139095041,
+     "enum_field_value" : 2155872255,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : -2130706433,
+     "enum_field_value" : 2164260863,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4738,7 +4746,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5460,7 +5468,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5535,7 +5543,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5556,7 +5564,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -12447,7 +12455,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfmmmS1_S3_mN7android11audio_utils7details13FILTER_OPTIONEELm32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -14221,7 +14229,7 @@
   {
    "alignment" : 8,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 8,
@@ -19380,7 +19388,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 28,
diff --git a/34/64/x86_64/source-based/libbase.so.lsdump b/34/64/x86_64/source-based/libbase.so.lsdump
index f9d589a..3ba235b 100644
--- a/34/64/x86_64/source-based/libbase.so.lsdump
+++ b/34/64/x86_64/source-based/libbase.so.lsdump
@@ -1093,12 +1093,21 @@
    "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"
   },
   {
@@ -1957,7 +1966,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -2008,7 +2017,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2764,7 +2773,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLm500ENSt3__19allocatorIcEEE4growEm",
    "parameters" :
    [
@@ -2798,7 +2807,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLm500ENSt3__19allocatorIwEEE4growEm",
    "parameters" :
    [
@@ -4965,6 +4974,23 @@
    "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" :
@@ -4983,6 +5009,22 @@
   },
   {
    "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" :
    [
@@ -4999,6 +5041,22 @@
   },
   {
    "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/x86_64/source-based/libbinder.so.lsdump b/34/64/x86_64/source-based/libbinder.so.lsdump
index 3d8a539..c0f92f6 100644
--- a/34/64/x86_64/source-based/libbinder.so.lsdump
+++ b/34/64/x86_64/source-based/libbinder.so.lsdump
@@ -73,6 +73,15 @@
    "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]",
@@ -91,15 +100,6 @@
    "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]",
@@ -1083,34 +1083,6 @@
    "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"
   },
   {
@@ -1882,214 +1854,6 @@
    "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"
   },
   {
@@ -2174,12 +1938,21 @@
    "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"
   },
   {
@@ -2345,22 +2118,6 @@
    "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_"
   },
   {
@@ -2376,22 +2133,6 @@
    "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"
   },
   {
@@ -2581,6 +2322,9 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
+   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
+  },
+  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2788,6 +2532,9 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
+   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
+  },
+  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3325,6 +3072,9 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
+   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
+  },
+  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3535,7 +3285,10 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvmEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvmEEE"
+  },
+  {
+   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3853,22 +3606,6 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedImEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
-  },
-  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -3998,6 +3735,9 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
+   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -4016,14 +3756,6 @@
    "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"
   },
   {
@@ -4207,198 +3939,6 @@
    "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"
   },
   {
@@ -4505,410 +4045,10 @@
   },
   {
    "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_EEEC2EmmS6_"
-  },
-  {
-   "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_EEEC2EmmSD_"
-  },
-  {
-   "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_EEEC2EmmS7_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferINS_8optionalIN7android8String16EEERNS_9allocatorIS4_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferINS_8optionalINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEEERNS5_IS8_EEEC2EmmSA_"
-  },
-  {
-   "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_"
   },
   {
@@ -4917,1269 +4057,9 @@
   },
   {
    "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"
   },
   {
@@ -6441,15 +4321,9 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
-   "name" : "_ZN7android16kEnableRecordingE"
-  },
-  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
-   "name" : "_ZN7android20kEnableRpcDevServersE"
-  },
-  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -6886,10 +4760,6 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android10PoolThreadE"
-  },
-  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -6917,10 +4787,6 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android15BpShellCallbackE"
-  },
-  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -6930,14 +4796,6 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android16BpResultReceiverE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
-  },
-  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -7001,14 +4859,6 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -7077,6 +4927,10 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android15RpcTransportRawE"
+  },
+  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -7100,6 +4954,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android18RpcTransportCtxRawE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -8668,7 +6526,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -8719,7 +6577,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -13106,104 +10964,6 @@
    "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" :
@@ -15689,849 +13449,6 @@
    "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" :
@@ -17053,6 +13970,23 @@
    "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" :
@@ -17071,6 +14005,22 @@
   },
   {
    "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" :
    [
@@ -17087,6 +14037,22 @@
   },
   {
    "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" :
    [
@@ -17735,114 +14701,6 @@
    "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" :
@@ -17915,114 +14773,6 @@
    "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" :
@@ -19048,6 +15798,19 @@
    "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" :
@@ -20155,6 +16918,12 @@
    "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" :
@@ -20949,6 +17718,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -20962,6 +17732,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -22762,7 +19533,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIb",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -22908,7 +19679,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvmEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvmEEE",
    "parameters" :
    [
     {
@@ -22916,7 +19687,23 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE"
+     "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"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24832,6 +21619,19 @@
    "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" :
@@ -24922,46 +21722,6 @@
    "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" :
@@ -25910,1062 +22670,6 @@
    "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" :
@@ -27796,10 +23500,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRA20_KDs",
-   "name" : "const char16_t (&)[20]",
-   "referenced_type" : "_ZTIA20_KDs",
-   "self_type" : "_ZTIRA20_KDs",
+   "linker_set_key" : "_ZTIRA1_KDs",
+   "name" : "const char16_t (&)[1]",
+   "referenced_type" : "_ZTIA1_KDs",
+   "self_type" : "_ZTIRA1_KDs",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -28005,7 +23709,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_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_64_static_afdo-libbinder_lto-thin/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"
@@ -28705,10 +24409,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILm20EEE",
-   "name" : "const android::String16::StaticData<20> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILm20EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILm20EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILm1EEE",
+   "name" : "const android::String16::StaticData<1> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILm1EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILm1EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -30744,8 +26448,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_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_64_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_x86_64_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
    "size" : 8,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -33442,10 +29146,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILm20EEE",
-   "name" : "android::StaticString16<20> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILm20EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILm20EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILm1EEE",
+   "name" : "android::StaticString16<1> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILm1EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILm1EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -34126,6 +29830,15 @@
   },
   {
    "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",
@@ -34756,10 +30469,10 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILm20EEE",
-   "name" : "android::String16::StaticData<20> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILm20EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILm1EEE",
+   "name" : "android::String16::StaticData<1> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILm1EEE",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -35601,6 +31314,16 @@
    "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",
@@ -35611,16 +31334,6 @@
    "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",
@@ -37889,11 +33602,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILm20EEE",
-   "name" : "const android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILm20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILm1EEE",
+   "name" : "const android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILm1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -38013,7 +33726,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 400,
+   "size" : 448,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -39424,6 +35137,46 @@
      "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",
@@ -50921,15 +46674,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 64,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILm20EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILm1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILm20EEE",
-   "name" : "android::StaticString16<20>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILm1EEE",
+   "name" : "android::StaticString16<1>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILm20EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILm20EEE",
-   "size" : 56,
+   "referenced_type" : "_ZTIN7android14StaticString16ILm1EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILm1EEE",
+   "size" : 16,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -54400,7 +50153,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.34_x86_64_shared/obj/frameworks/native/libs/binder/Binder.sdump"
+     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/native/libs/binder/Binder.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -54450,6 +50203,34 @@
     {
      "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"
     },
     {
@@ -61932,6 +57713,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 792,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
@@ -64039,14 +59826,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA20_Ds"
+     "referenced_type" : "_ZTIA1_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILm20EEE",
-   "name" : "android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILm20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILm1EEE",
+   "name" : "android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILm1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -64488,7 +60275,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 1280,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvmEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvmEEE"
     },
     {
      "access" : "private",
@@ -64498,26 +60285,32 @@
     },
     {
      "access" : "private",
-     "field_name" : "mSessions",
+     "field_name" : "mServerSocketModifier",
      "field_offset" : 2048,
+     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSessions",
+     "field_offset" : 2432,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 2240,
+     "field_offset" : 2624,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 2304,
+     "field_offset" : 2688,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 2688,
+     "field_offset" : 3072,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -64526,12 +60319,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 400,
+   "size" : 448,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 384,
+     "component_value" : 432,
      "kind" : "vbase_offset"
     },
     {
@@ -64568,11 +60361,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -384,
+     "component_value" : -432,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -384,
+     "component_value" : -432,
      "kind" : "offset_to_top"
     },
     {
@@ -65719,10 +61512,10 @@
   },
   {
    "alignment" : 8,
-   "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",
+   "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",
    "size" : 8,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -65755,6 +61548,15 @@
   },
   {
    "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/x86_64/source-based/libc++.so.lsdump b/34/64/x86_64/source-based/libc++.so.lsdump
index cbecffc..93868f5 100644
--- a/34/64/x86_64/source-based/libc++.so.lsdump
+++ b/34/64/x86_64/source-based/libc++.so.lsdump
@@ -2613,14 +2613,6 @@
    "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_"
   },
   {
@@ -3783,10 +3775,6 @@
    "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"
   },
   {
@@ -4427,34 +4415,10 @@
   },
   {
    "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__lessIffEEPfEEvT0_S5_T_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIggEEPgEEvT0_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_"
   },
   {
@@ -4470,22 +4434,6 @@
    "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"
   },
   {
@@ -4661,10 +4609,6 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcm"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNSt3__123mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EEclEv"
-  },
-  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -5053,34 +4997,10 @@
   },
   {
    "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__lessIffEEPfEEjT0_S5_S5_T_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__17__sort3IRNS_6__lessIggEEPgEEjT0_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_"
   },
   {
@@ -5097,50 +5017,10 @@
   },
   {
    "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__lessIffEEPfEEjT0_S5_S5_S5_T_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__17__sort4IRNS_6__lessIggEEPgEEjT0_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_"
   },
   {
@@ -5157,22 +5037,6 @@
   },
   {
    "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__lessIggEEPgEEjT0_S5_S5_S5_S5_T_"
   },
   {
@@ -9931,7 +9795,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_grouping",
+   "function_name" : "std::moneypunct<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9945,7 +9809,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9959,7 +9823,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9973,7 +9837,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -9987,7 +9851,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10001,7 +9865,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10015,7 +9879,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10029,7 +9893,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10043,7 +9907,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10183,7 +10047,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10197,7 +10061,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10211,7 +10075,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10225,7 +10089,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10239,7 +10103,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10253,7 +10117,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10267,7 +10131,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10281,7 +10145,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10295,7 +10159,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13214,7 +13078,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13228,7 +13092,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13242,7 +13106,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13256,7 +13120,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13270,7 +13134,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13284,7 +13148,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13298,7 +13162,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13312,7 +13176,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13326,7 +13190,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13466,7 +13330,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13480,7 +13344,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13494,7 +13358,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13508,7 +13372,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13522,7 +13386,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13536,7 +13400,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13550,7 +13414,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13564,7 +13428,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13578,7 +13442,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20309,50 +20173,6 @@
    "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" :
@@ -25783,25 +25603,6 @@
    "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" :
@@ -28552,7 +28353,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char, false>::init",
+   "function_name" : "std::moneypunct_byname<char>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28586,7 +28387,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28620,121 +28421,6 @@
   },
   {
    "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__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__lessIggEEPgEEvT0_S5_T_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPg"
-    },
-    {
-     "referenced_type" : "_ZTIPg"
-    },
-    {
-     "referenced_type" : "_ZTIRNSt3__16__lessIggEE"
-    }
-   ],
-   "return_type" : "_ZTIv",
-   "source_file" : "external/libcxx/include/algorithm",
-   "template_args" :
-   [
-    "_ZTIRNSt3__16__lessIggEE",
-    "_ZTIPg"
-   ]
-  },
-  {
-   "function_name" : "std::__insertion_sort_3",
    "linker_set_key" : "_ZNSt3__118__insertion_sort_3IRNS_6__lessIhhEEPhEEvT0_S5_T_",
    "parameters" :
    [
@@ -28758,29 +28444,6 @@
   },
   {
    "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" :
    [
@@ -28872,98 +28535,6 @@
    ]
   },
   {
-   "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",
@@ -29775,19 +29346,6 @@
    "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" :
@@ -31828,136 +31386,6 @@
   },
   {
    "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__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__lessIggEEPgEEjT0_S5_S5_T_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPg"
-    },
-    {
-     "referenced_type" : "_ZTIPg"
-    },
-    {
-     "referenced_type" : "_ZTIPg"
-    },
-    {
-     "referenced_type" : "_ZTIRNSt3__16__lessIggEE"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/libcxx/include/algorithm",
-   "template_args" :
-   [
-    "_ZTIRNSt3__16__lessIggEE",
-    "_ZTIPg"
-   ]
-  },
-  {
-   "function_name" : "std::__sort3",
    "linker_set_key" : "_ZNSt3__17__sort3IRNS_6__lessIhhEEPhEEjT0_S5_S5_T_",
    "parameters" :
    [
@@ -31984,32 +31412,6 @@
   },
   {
    "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" :
    [
@@ -32113,255 +31515,6 @@
    ]
   },
   {
-   "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__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__lessIggEEPgEEjT0_S5_S5_S5_T_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPg"
-    },
-    {
-     "referenced_type" : "_ZTIPg"
-    },
-    {
-     "referenced_type" : "_ZTIPg"
-    },
-    {
-     "referenced_type" : "_ZTIPg"
-    },
-    {
-     "referenced_type" : "_ZTIRNSt3__16__lessIggEE"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "external/libcxx/include/algorithm",
-   "template_args" :
-   [
-    "_ZTIRNSt3__16__lessIggEE",
-    "_ZTIPg"
-   ]
-  },
-  {
    "function_name" : "std::__sort4",
    "linker_set_key" : "_ZNSt3__17__sort4IRNS_6__lessIhhEEPhEEjT0_S5_S5_S5_T_",
    "parameters" :
@@ -32392,35 +31545,6 @@
   },
   {
    "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" :
    [
@@ -32536,122 +31660,6 @@
    ]
   },
   {
-   "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__lessIggEEPgEEjT0_S5_S5_S5_S5_T_",
    "parameters" :
@@ -35536,13 +34544,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char, false>::id",
+   "name" : "std::moneypunct<char>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char, false>::intl",
+   "name" : "std::moneypunct<char>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -35560,13 +34568,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t, false>::id",
+   "name" : "std::moneypunct<wchar_t>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t, false>::intl",
+   "name" : "std::moneypunct<wchar_t>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -55354,7 +54362,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -55363,7 +54371,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55378,7 +54386,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -55387,7 +54395,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIgNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55402,7 +54410,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEEEEE",
    "size" : 1,
@@ -55411,7 +54419,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl3600ELl1EEEEES5_EEE",
    "size" : 1,
@@ -55426,7 +54434,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEEEEE",
    "size" : 1,
@@ -55435,7 +54443,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILl60ELl1EEEEES5_EEE",
    "size" : 1,
@@ -116727,7 +115735,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm0ELm0EEE",
    "size" : 1,
@@ -116736,7 +115744,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILm1ELm0EEE",
    "size" : 1,
@@ -137240,7 +136248,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000000ELl1EEE",
@@ -137250,7 +136258,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
-   "name" : "std::ratio<1000000, 1>",
+   "name" : "std::ratio<1000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1000000ELl1EEE",
@@ -137290,7 +136298,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl1ELl1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl1ELl1EEE",
@@ -137300,7 +136308,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl3600ELl1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl3600ELl1EEE",
@@ -137310,7 +136318,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILl60ELl1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
    "self_type" : "_ZTINSt3__15ratioILl60ELl1EEE",
@@ -138561,7 +137569,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1000000000, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1000000000ELb0EEE",
    "size" : 1,
@@ -138570,7 +137578,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -138579,7 +137587,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowINS2_ILl1ELl1000000000EEES3_EE",
    "size" : 1,
@@ -138593,7 +137601,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<1>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -138602,7 +137610,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -138639,7 +137647,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -138648,7 +137656,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -138685,7 +137693,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__mul<1, 1, false>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
    "size" : 1,
@@ -138694,7 +137702,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
    "referenced_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
    "self_type" : "_ZTINSt3__16chrono8durationIgNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
    "size" : 1,
@@ -138731,7 +137739,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__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,
@@ -138740,7 +137748,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl3600ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__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,
@@ -138777,7 +137785,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__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,
@@ -138786,7 +137794,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILl60ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__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,
@@ -138823,7 +137831,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -138832,7 +137840,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -138901,7 +137909,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<__int128, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -138910,7 +137918,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationInNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<__int128, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<__int128, std::ratio<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,
@@ -138947,7 +137955,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -138956,7 +137964,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -139025,7 +138033,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -139034,7 +138042,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -139149,7 +138157,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_E5__mulILl1ELl1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -139158,7 +138166,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILl1ELl1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<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/x86_64/source-based/libcap.so.lsdump b/34/64/x86_64/source-based/libcap.so.lsdump
index 0afd1e2..2bac82d 100644
--- a/34/64/x86_64/source-based/libcap.so.lsdump
+++ b/34/64/x86_64/source-based/libcap.so.lsdump
@@ -59,9 +59,6 @@
  "elf_functions" :
  [
   {
-   "name" : "_libcap_strdup"
-  },
-  {
    "name" : "cap_clear"
   },
   {
@@ -89,6 +86,9 @@
    "name" : "cap_fill"
   },
   {
+   "name" : "cap_fill_flag"
+  },
+  {
    "name" : "cap_free"
   },
   {
@@ -131,12 +131,21 @@
    "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,6 +203,9 @@
    "name" : "cap_prctlw"
   },
   {
+   "name" : "cap_proc_root"
+  },
+  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -531,6 +543,27 @@
    "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" :
@@ -693,6 +726,33 @@
    "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" :
@@ -726,6 +786,18 @@
    "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",
@@ -833,7 +905,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -848,7 +920,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -878,7 +950,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -899,7 +971,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -914,7 +986,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -1008,6 +1080,18 @@
    "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/x86_64/source-based/libcodec2.so.lsdump b/34/64/x86_64/source-based/libcodec2.so.lsdump
index b15d805..99ccf32 100644
--- a/34/64/x86_64/source-based/libcodec2.so.lsdump
+++ b/34/64/x86_64/source-based/libcodec2.so.lsdump
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA12_m",
    "size" : 96,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 56,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1268,7 +1268,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -1284,11 +1284,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -1297,7 +1297,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1754,7 +1754,7 @@
      "name" : "C2FrameData::FLAG_CORRUPT"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
    ],
@@ -2492,7 +2492,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -16,
+     "enum_field_value" : 18446744073709551600,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3618,7 +3618,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3976,7 +3976,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Param::CoreIndex::KIND_MASK"
     },
     {
@@ -3988,11 +3988,11 @@
      "name" : "C2Param::CoreIndex::KIND_TUNING"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "C2Param::CoreIndex::KIND_SETTING"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4280,11 +4280,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "C2Config::API_TUNNELING"
     }
    ],
@@ -5895,7 +5895,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "C2Setting::PARAM_KIND"
     }
    ],
@@ -5923,7 +5923,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -5941,7 +5941,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5974,7 +5974,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5989,7 +5989,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6007,7 +6007,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6025,7 +6025,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6052,7 +6052,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6073,7 +6073,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6091,7 +6091,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6112,7 +6112,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6136,7 +6136,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6172,7 +6172,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6211,7 +6211,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6247,7 +6247,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6286,7 +6286,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6319,7 +6319,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6337,7 +6337,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6358,7 +6358,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6379,7 +6379,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   }
  ],
  "functions" : [],
@@ -6702,7 +6702,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -6711,7 +6711,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -6756,7 +6756,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -6765,7 +6765,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -6945,7 +6945,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7017,7 +7017,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7224,7 +7224,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7233,7 +7233,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7242,7 +7242,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7251,7 +7251,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7260,7 +7260,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7269,7 +7269,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7278,7 +7278,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7287,7 +7287,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7296,7 +7296,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7305,7 +7305,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7314,7 +7314,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7323,7 +7323,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7332,7 +7332,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7341,7 +7341,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7350,7 +7350,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7359,7 +7359,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7368,7 +7368,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7377,7 +7377,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7386,7 +7386,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7413,7 +7413,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7449,7 +7449,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -7494,7 +7494,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7782,7 +7782,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -7791,7 +7791,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -7800,7 +7800,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -8165,7 +8165,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -8225,7 +8225,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -8275,7 +8275,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -9020,7 +9020,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -9076,7 +9076,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -9560,7 +9560,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -10028,7 +10028,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10620,7 +10620,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10987,7 +10987,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
diff --git a/34/64/x86_64/source-based/libcrypto.so.lsdump b/34/64/x86_64/source-based/libcrypto.so.lsdump
index 3f58701..cc53b91 100644
--- a/34/64/x86_64/source-based/libcrypto.so.lsdump
+++ b/34/64/x86_64/source-based/libcrypto.so.lsdump
@@ -38,15 +38,6 @@
    "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]",
@@ -129,11 +120,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -602,6 +593,9 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
+   "name" : "ASN1_TIME_set_string_X509"
+  },
+  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1853,18 +1847,6 @@
    "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"
   },
   {
@@ -2606,6 +2588,18 @@
    "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"
   },
   {
@@ -3062,6 +3056,15 @@
    "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"
   },
   {
@@ -3497,6 +3500,9 @@
    "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"
   },
   {
@@ -3716,6 +3722,9 @@
    "name" : "EVP_sha256"
   },
   {
+   "name" : "EVP_sha256_final_with_secret_suffix"
+  },
+  {
    "name" : "EVP_sha384"
   },
   {
@@ -4160,6 +4169,69 @@
    "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"
   },
   {
@@ -4766,6 +4838,27 @@
    "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"
   },
   {
@@ -7355,36 +7448,9 @@
    "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"
   },
   {
@@ -7403,24 +7469,9 @@
    "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"
   },
   {
@@ -8485,23 +8536,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8865,6 +8916,30 @@
      "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_x86_64_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_x86_64_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_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -10365,6 +10440,21 @@
    "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" :
@@ -16242,6 +16332,21 @@
    "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" :
@@ -17301,6 +17406,135 @@
    "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" :
@@ -19185,6 +19419,12 @@
    "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",
@@ -20709,6 +20949,318 @@
    "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" :
@@ -27224,10 +27776,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27296,7 +27848,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29312,7 +29864,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30101,7 +30653,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31346,7 +31898,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31367,7 +31919,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -35721,114 +36273,6 @@
    "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" :
@@ -35841,48 +36285,6 @@
    "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",
@@ -35961,66 +36363,6 @@
    "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" :
@@ -36036,18 +36378,6 @@
    "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" :
@@ -36887,24 +37217,6 @@
   },
   {
    "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",
@@ -37022,6 +37334,15 @@
   },
   {
    "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",
@@ -37913,10 +38234,10 @@
   },
   {
    "alignment" : 8,
-   "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",
+   "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",
    "size" : 8,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38068,6 +38389,15 @@
    "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_x86_64_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_x86_64_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_x86_64_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_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 8,
@@ -38338,6 +38668,15 @@
    "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_x86_64_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 8,
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 8,
@@ -39119,6 +39458,15 @@
   },
   {
    "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",
@@ -39133,7 +39481,7 @@
    "referenced_type" : "_ZTIKv",
    "self_type" : "_ZTIPKv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
   {
    "alignment" : 8,
@@ -39326,15 +39674,6 @@
   },
   {
    "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",
@@ -39736,7 +40075,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
    "alignment" : 8,
@@ -39808,7 +40147,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/bio.h"
   }
  ],
  "qualified_types" :
@@ -39870,7 +40209,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 392,
+   "size" : 544,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40192,7 +40531,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 728,
+   "size" : 712,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40212,7 +40551,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 72,
+   "size" : 88,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40612,17 +40951,15 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 144,
+   "size" : 128,
    "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"
   },
   {
@@ -40746,6 +41083,16 @@
   {
    "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",
@@ -40759,7 +41106,7 @@
    "name" : "const void",
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIKv",
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   }
  ],
  "record_types" :
@@ -41002,6 +41349,42 @@
     {
      "field_name" : "asn1_cb",
      "field_offset" : 128,
+     "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_x86_64_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_x86_64_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_x86_64_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_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -42151,7 +42534,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4736,
+     "field_offset" : 4608,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42159,7 +42542,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42187,22 +42570,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4992,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5184,
+     "field_offset" : 5056,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5696,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIm"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5760,
+     "field_offset" : 5632,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42210,7 +42593,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 728,
+   "size" : 712,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42503,7 +42886,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
+     "referenced_type" : "_ZTIA128_h"
     },
     {
      "field_name" : "block_used",
@@ -43033,7 +43416,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -43045,7 +43428,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 584,
+   "size" : 568,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43234,249 +43617,6 @@
    "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"
     },
@@ -43757,28 +43897,6 @@
    "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/x86_64/source-based/libcrypto_utils.so.lsdump b/34/64/x86_64/source-based/libcrypto_utils.so.lsdump
index 305a6ec..4f48f00 100644
--- a/34/64/x86_64/source-based/libcrypto_utils.so.lsdump
+++ b/34/64/x86_64/source-based/libcrypto_utils.so.lsdump
@@ -137,13 +137,11 @@
  "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/x86_64/source-based/libcurl.so.lsdump b/34/64/x86_64/source-based/libcurl.so.lsdump
index 5cd6e74..aa62a65 100644
--- a/34/64/x86_64/source-based/libcurl.so.lsdump
+++ b/34/64/x86_64/source-based/libcurl.so.lsdump
@@ -112,12 +112,6 @@
    "name" : "Curl_all_content_encodings"
   },
   {
-   "name" : "Curl_alpn_get_proxy_spec"
-  },
-  {
-   "name" : "Curl_alpn_get_spec"
-  },
-  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -208,9 +202,81 @@
    "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"
   },
   {
@@ -280,6 +346,9 @@
    "name" : "Curl_cf_def_send"
   },
   {
+   "name" : "Curl_cf_h1_proxy_insert_after"
+  },
+  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -292,6 +361,9 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
+   "name" : "Curl_cf_http_proxy_get_host"
+  },
+  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -367,15 +439,15 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard"
-  },
-  {
    "name" : "Curl_conn_cf_discard_all"
   },
   {
    "name" : "Curl_conn_cf_discard_chain"
   },
   {
+   "name" : "Curl_conn_cf_discard_sub"
+  },
+  {
    "name" : "Curl_conn_cf_get_select_socks"
   },
   {
@@ -385,6 +457,9 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
+   "name" : "Curl_conn_cf_is_ssl"
+  },
+  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -439,9 +514,6 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
-   "name" : "Curl_conn_http_proxy_add"
-  },
-  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -610,6 +682,72 @@
    "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"
   },
   {
@@ -682,6 +820,15 @@
    "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"
   },
   {
@@ -784,6 +931,9 @@
    "name" : "Curl_http_cookies"
   },
   {
+   "name" : "Curl_http_decode_status"
+  },
+  {
    "name" : "Curl_http_done"
   },
   {
@@ -811,6 +961,24 @@
    "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"
   },
   {
@@ -1486,6 +1654,9 @@
    "name" : "Curl_updatesocket"
   },
   {
+   "name" : "Curl_url_set_authority"
+  },
+  {
    "name" : "Curl_urldecode"
   },
   {
@@ -1849,6 +2020,9 @@
    "name" : "Curl_cfree"
   },
   {
+   "name" : "Curl_cft_h1_proxy"
+  },
+  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4256,6 +4430,10 @@
      "name" : "CURLPROXY_HTTPS"
     },
     {
+     "enum_field_value" : 3,
+     "name" : "CURLPROXY_HTTPS2"
+    },
+    {
      "enum_field_value" : 4,
      "name" : "CURLPROXY_SOCKS4"
     },
diff --git a/34/64/x86_64/source-based/libdiskconfig.so.lsdump b/34/64/x86_64/source-based/libdiskconfig.so.lsdump
deleted file mode 100644
index db7901f..0000000
--- a/34/64/x86_64/source-based/libdiskconfig.so.lsdump
+++ /dev/null
@@ -1,641 +0,0 @@
-{
- "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,
-   "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/x86_64/source-based/libdmabufheap.so.lsdump b/34/64/x86_64/source-based/libdmabufheap.so.lsdump
index ad5c579..6313e84 100644
--- a/34/64/x86_64/source-based/libdmabufheap.so.lsdump
+++ b/34/64/x86_64/source-based/libdmabufheap.so.lsdump
@@ -1553,7 +1553,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1604,7 +1604,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
diff --git a/34/64/x86_64/source-based/libdumpstateutil.so.lsdump b/34/64/x86_64/source-based/libdumpstateutil.so.lsdump
index 182b399..d8f8587 100644
--- a/34/64/x86_64/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/x86_64/source-based/libdumpstateutil.so.lsdump
@@ -152,6 +152,9 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -201,6 +204,9 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -573,6 +579,12 @@
    "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",
@@ -711,6 +723,13 @@
   },
   {
    "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/x86_64/source-based/libgralloctypes.so.lsdump b/34/64/x86_64/source-based/libgralloctypes.so.lsdump
index cb9aebf..ac36301 100644
--- a/34/64/x86_64/source-based/libgralloctypes.so.lsdump
+++ b/34/64/x86_64/source-based/libgralloctypes.so.lsdump
@@ -2860,11 +2860,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3451,11 +3451,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4036,11 +4036,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_64/source-based/libhardware.so.lsdump b/34/64/x86_64/source-based/libhardware.so.lsdump
index 74777c5..f7204c0 100644
--- a/34/64/x86_64/source-based/libhardware.so.lsdump
+++ b/34/64/x86_64/source-based/libhardware.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA12_m",
    "size" : 96,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -945,7 +945,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -966,7 +966,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -984,7 +984,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -1002,7 +1002,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "global_vars" : [],
@@ -1016,7 +1016,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1025,7 +1025,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1043,7 +1043,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1052,7 +1052,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1061,7 +1061,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1070,7 +1070,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1079,7 +1079,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1088,7 +1088,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1097,7 +1097,7 @@
    "referenced_type" : "_ZTIPK11hw_module_t",
    "self_type" : "_ZTIPPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1128,7 +1128,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1138,7 +1138,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "record_types" :
@@ -1177,7 +1177,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1233,7 +1233,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -1424,7 +1424,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86_64/source-based/libhidlbase.so.lsdump b/34/64/x86_64/source-based/libhidlbase.so.lsdump
index 6501231..cfe8518 100644
--- a/34/64/x86_64/source-based/libhidlbase.so.lsdump
+++ b/34/64/x86_64/source-based/libhidlbase.so.lsdump
@@ -263,14 +263,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -283,10 +275,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -299,10 +287,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -311,11 +295,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
   },
   {
    "binding" : "weak",
@@ -2365,26 +2349,6 @@
   },
   {
    "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"
   },
   {
@@ -2788,10 +2752,6 @@
   },
   {
    "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"
   },
   {
@@ -2808,10 +2768,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2876,6 +2832,10 @@
   },
   {
    "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"
+  },
+  {
+   "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_"
   },
   {
@@ -2884,10 +2844,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__18functionIFbbEEclEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__18functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS7_S7_S7_PNS_6vectorIPvNS_9allocatorIS9_EEEEEEclES5_S7_S7_S7_S7_SD_"
   },
   {
@@ -2896,14 +2852,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
   },
   {
@@ -2912,6 +2860,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -2924,18 +2876,10 @@
   },
   {
    "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_"
   },
   {
@@ -2952,14 +2896,6 @@
   },
   {
    "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"
   },
   {
@@ -2972,10 +2908,6 @@
   },
   {
    "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_"
   },
   {
@@ -2996,10 +2928,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -3044,6 +2972,10 @@
   },
   {
    "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_"
   },
   {
@@ -3060,10 +2992,6 @@
   },
   {
    "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"
   },
   {
@@ -3072,22 +3000,10 @@
   },
   {
    "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"
   },
   {
@@ -3096,14 +3012,6 @@
   },
   {
    "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_"
   },
   {
@@ -3112,10 +3020,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS_9allocatorIS7_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEED2Ev"
   },
   {
@@ -3124,22 +3028,10 @@
   },
   {
    "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"
   },
   {
@@ -3152,26 +3044,10 @@
   },
   {
    "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"
   },
   {
@@ -3224,7 +3100,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3244,42 +3120,6 @@
   },
   {
    "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_EEEC2EmmS7_"
-  },
-  {
-   "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_"
   },
   {
@@ -3292,10 +3132,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3304,10 +3140,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3316,19 +3148,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3428,70 +3256,18 @@
   },
   {
    "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_"
   },
   {
@@ -3508,10 +3284,6 @@
   },
   {
    "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_"
   },
   {
@@ -3524,14 +3296,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_4hidl4base4V1_05IBaseEEEPvEEEEENS_19__map_value_compareIS7_SJ_NS_4lessIS7_EELb1EEENS5_ISJ_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_"
   },
   {
@@ -3548,14 +3312,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_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_"
   },
   {
@@ -3576,10 +3332,6 @@
   },
   {
    "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_PvEElEE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE16__insert_node_atEPNS_15__tree_end_nodeIPNS_16__tree_node_baseIPvEEEERSA_SA_"
   },
   {
@@ -3592,6 +3344,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__16vectorIN7android2wpINS1_4hidl4base4V1_05IBaseEEENS_9allocatorIS7_EEE21__push_back_slow_pathIRKS7_EEvOT_"
   },
   {
@@ -3604,10 +3360,6 @@
   },
   {
    "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_"
   },
   {
@@ -3620,10 +3372,6 @@
   },
   {
    "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_"
   },
   {
@@ -3632,30 +3380,10 @@
   },
   {
    "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"
   },
   {
@@ -3668,18 +3396,10 @@
   },
   {
    "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"
   },
   {
@@ -3696,10 +3416,6 @@
   },
   {
    "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_"
   },
   {
@@ -3708,10 +3424,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE6resizeEmRKS4_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_9sub_matchIPKcEENS_9allocatorIS4_EEE8__appendEmRKS4_"
   },
   {
@@ -3720,22 +3432,10 @@
   },
   {
    "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_"
   },
   {
@@ -3744,14 +3444,6 @@
   },
   {
    "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"
   },
   {
@@ -3760,10 +3452,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -3772,10 +3460,6 @@
   },
   {
    "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"
   },
   {
@@ -4052,10 +3736,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -4087,10 +3767,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -4176,10 +3852,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -4327,10 +3999,6 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
-  },
-  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4340,10 +4008,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4353,10 +4017,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4383,10 +4043,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8771,42 +8427,6 @@
    "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" :
@@ -8855,22 +8475,6 @@
    "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" :
@@ -8920,22 +8524,6 @@
   },
   {
    "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" :
    [
@@ -8968,22 +8556,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "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_8hardware27hidl_binder_death_recipientEEE"
-    },
-    {
-     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-    }
-   ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::IBinder>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
@@ -9000,6 +8572,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::wp<android::hardware::BHwBinder>::operator=",
    "linker_set_key" : "_ZN7android2wpINS_8hardware9BHwBinderEEaSERKS3_",
    "parameters" :
@@ -19434,91 +19022,6 @@
   },
   {
    "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" :
    [
@@ -21888,8 +21391,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_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_x86_64_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_x86_64_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -23239,7 +22742,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_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_x86_64_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/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/x86_64/source-based/libmedia_helper.so.lsdump b/34/64/x86_64/source-based/libmedia_helper.so.lsdump
index 50e90cc..4066940 100644
--- a/34/64/x86_64/source-based/libmedia_helper.so.lsdump
+++ b/34/64/x86_64/source-based/libmedia_helper.so.lsdump
@@ -667,21 +667,33 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10valueHacOnE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
+   "name" : "_ZN7android14AudioParameter11valueHacOffE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
+   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -703,6 +715,15 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -712,6 +733,9 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
+   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1425,12 +1449,24 @@
    "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",
@@ -1443,6 +1479,12 @@
    "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",
@@ -1455,6 +1497,12 @@
    "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",
@@ -1497,6 +1545,24 @@
    "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",
@@ -1515,6 +1581,12 @@
    "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/x86_64/source-based/libmedia_omx.so.lsdump b/34/64/x86_64/source-based/libmedia_omx.so.lsdump
index 4473903..5ea79b5 100644
--- a/34/64/x86_64/source-based/libmedia_omx.so.lsdump
+++ b/34/64/x86_64/source-based/libmedia_omx.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA12_m",
    "size" : 96,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -205,7 +205,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5548,7 +5548,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -5564,11 +5564,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -5577,7 +5577,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5920,7 +5920,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5936,71 +5936,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -10605,11 +10605,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -11196,11 +11196,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -11781,11 +11781,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12744,7 +12744,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12762,7 +12762,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12795,7 +12795,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12810,7 +12810,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12828,7 +12828,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12846,7 +12846,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12873,7 +12873,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12918,7 +12918,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12936,7 +12936,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12957,7 +12957,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12981,7 +12981,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13017,7 +13017,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13056,7 +13056,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13092,7 +13092,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13131,7 +13131,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13164,7 +13164,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13182,7 +13182,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13218,7 +13218,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13239,7 +13239,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17010,7 +17010,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17019,7 +17019,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17046,7 +17046,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17073,7 +17073,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17100,7 +17100,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17118,7 +17118,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17235,7 +17235,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17244,7 +17244,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17253,7 +17253,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17262,7 +17262,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17271,7 +17271,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17280,7 +17280,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17289,7 +17289,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17307,7 +17307,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17316,7 +17316,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17325,7 +17325,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17334,7 +17334,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17343,7 +17343,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17352,7 +17352,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17361,7 +17361,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17370,7 +17370,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17379,7 +17379,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17388,7 +17388,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17406,7 +17406,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -17415,7 +17415,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -17442,7 +17442,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -17460,7 +17460,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -18886,6 +18886,15 @@
   },
   {
    "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",
@@ -18994,6 +19003,15 @@
   },
   {
    "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",
@@ -20340,7 +20358,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -20367,7 +20385,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -20556,7 +20574,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20586,7 +20604,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22361,11 +22379,13 @@
    "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"
   },
   {
@@ -23183,7 +23203,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23239,7 +23259,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -23424,7 +23444,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23568,7 +23588,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23861,7 +23881,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -24243,7 +24263,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -35362,6 +35382,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 792,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
      "referenced_type" : "_ZTIPFvPKhmPKymE"
@@ -43472,6 +43498,15 @@
   },
   {
    "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/x86_64/source-based/libprocessgroup.so.lsdump b/34/64/x86_64/source-based/libprocessgroup.so.lsdump
index bca720d..38f19ef 100644
--- a/34/64/x86_64/source-based/libprocessgroup.so.lsdump
+++ b/34/64/x86_64/source-based/libprocessgroup.so.lsdump
@@ -145,6 +145,9 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
+   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
+  },
+  {
    "name" : "_Z24sendSignalToProcessGroupjii"
   },
   {
@@ -246,7 +249,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1134,9 +1137,15 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1152,9 +1161,15 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1167,12 +1182,18 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1200,21 +1221,42 @@
    "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/x86_64/source-based/libsqlite.so.lsdump b/34/64/x86_64/source-based/libsqlite.so.lsdump
index 4e71874..4282a1d 100644
--- a/34/64/x86_64/source-based/libsqlite.so.lsdump
+++ b/34/64/x86_64/source-based/libsqlite.so.lsdump
@@ -337,6 +337,9 @@
    "name" : "sqlite3_interrupt"
   },
   {
+   "name" : "sqlite3_is_interrupted"
+  },
+  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -691,6 +694,9 @@
    "name" : "sqlite3_value_dup"
   },
   {
+   "name" : "sqlite3_value_encoding"
+  },
+  {
    "name" : "sqlite3_value_free"
   },
   {
diff --git a/34/64/x86_64/source-based/libssl.so.lsdump b/34/64/x86_64/source-based/libssl.so.lsdump
index b1645cd..5f76fe4 100644
--- a/34/64/x86_64/source-based/libssl.so.lsdump
+++ b/34/64/x86_64/source-based/libssl.so.lsdump
@@ -20,6 +20,15 @@
    "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]",
@@ -65,6 +74,15 @@
    "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]",
@@ -119,6 +137,15 @@
    "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]",
@@ -165,11 +192,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -200,6 +227,24 @@
    "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]",
@@ -529,6 +574,9 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
+   "name" : "SSL_CIPHER_get_handshake_digest"
+  },
+  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -553,9 +601,6 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
-   "name" : "SSL_CIPHER_get_value"
-  },
-  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -820,6 +865,9 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
+   "name" : "SSL_CTX_set1_group_ids"
+  },
+  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1381,6 +1429,24 @@
    "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"
   },
   {
@@ -1441,6 +1507,12 @@
    "name" : "SSL_get_finished"
   },
   {
+   "name" : "SSL_get_group_id"
+  },
+  {
+   "name" : "SSL_get_group_name"
+  },
+  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1462,6 +1534,9 @@
    "name" : "SSL_get_mode"
   },
   {
+   "name" : "SSL_get_negotiated_group"
+  },
+  {
    "name" : "SSL_get_options"
   },
   {
@@ -1732,6 +1807,9 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
+   "name" : "SSL_set1_group_ids"
+  },
+  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2110,6 +2188,9 @@
    "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"
   },
   {
@@ -6717,6 +6798,18 @@
    "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" :
@@ -6813,18 +6906,6 @@
    "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" :
@@ -7983,6 +8064,24 @@
    "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" :
@@ -10818,6 +10917,96 @@
    "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" :
@@ -11085,6 +11274,30 @@
    "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" :
@@ -11178,6 +11391,18 @@
    "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" :
@@ -12435,6 +12660,24 @@
    "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" :
@@ -14261,6 +14504,15 @@
   },
   {
    "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",
@@ -14288,6 +14540,15 @@
   },
   {
    "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",
@@ -14333,6 +14594,15 @@
   },
   {
    "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",
@@ -14342,6 +14612,15 @@
   },
   {
    "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",
@@ -14360,6 +14639,24 @@
   },
   {
    "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",
@@ -14387,6 +14684,24 @@
   },
   {
    "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",
@@ -14396,6 +14711,33 @@
   },
   {
    "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",
@@ -14549,6 +14891,15 @@
   },
   {
    "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",
@@ -14639,6 +14990,15 @@
   },
   {
    "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",
@@ -14759,15 +15119,6 @@
   },
   {
    "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",
@@ -15011,15 +15362,6 @@
   },
   {
    "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",
@@ -18242,6 +18584,15 @@
   },
   {
    "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",
@@ -18485,6 +18836,15 @@
   },
   {
    "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",
@@ -18494,6 +18854,15 @@
   },
   {
    "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",
@@ -18503,6 +18872,24 @@
   },
   {
    "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",
@@ -18548,6 +18935,15 @@
   },
   {
    "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",
@@ -19124,6 +19520,15 @@
   },
   {
    "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",
@@ -19133,6 +19538,24 @@
   },
   {
    "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",
@@ -19178,6 +19601,15 @@
   },
   {
    "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",
@@ -19340,15 +19772,6 @@
   },
   {
    "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",
@@ -19381,7 +19804,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
    "alignment" : 8,
@@ -19417,7 +19840,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 8,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 8,
@@ -19496,6 +19919,16 @@
    "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",
@@ -19526,6 +19959,16 @@
    "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",
@@ -19566,6 +20009,16 @@
    "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",
@@ -19596,6 +20049,26 @@
    "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",
@@ -19896,7 +20369,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20222,6 +20695,16 @@
    "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",
@@ -20394,13 +20877,11 @@
    "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"
   },
   {
@@ -20452,7 +20933,17 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 32,
+   "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,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20468,6 +20959,16 @@
   {
    "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",
@@ -20478,6 +20979,26 @@
   {
    "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",
@@ -20528,6 +21049,16 @@
   {
    "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",
@@ -20572,7 +21103,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" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22361,7 +22892,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4736,
+     "field_offset" : 4608,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22369,7 +22900,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22397,22 +22928,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4992,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 5184,
+     "field_offset" : 5056,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5696,
+     "field_offset" : 5568,
      "referenced_type" : "_ZTIm"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5760,
+     "field_offset" : 5632,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22420,7 +22951,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 728,
+   "size" : 712,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23186,7 +23717,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -23198,7 +23729,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 584,
+   "size" : 568,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -23525,249 +24056,6 @@
    "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"
     },
@@ -24176,6 +24464,41 @@
    [
     {
      "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"
     }
    ],
@@ -24211,6 +24534,76 @@
    [
     {
      "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"
     }
    ],
@@ -24386,6 +24779,41 @@
    [
     {
      "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"
     }
    ],
@@ -26071,7 +26499,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" : 600,
+   "size" : 584,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26094,7 +26522,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" : 728,
+   "size" : 712,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26359,6 +26787,20 @@
   },
   {
    "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",
@@ -26373,6 +26815,34 @@
   },
   {
    "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/x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump b/34/64/x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
index 9cf080d..c77cb31 100644
--- a/34/64/x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/34/64/x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -5423,7 +5423,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" : 48,
+   "size" : 56,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -5453,7 +5453,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" : 48,
+   "size" : 56,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6716,13 +6716,19 @@
      "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" : 48,
+   "size" : 56,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6813,13 +6819,19 @@
      "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" : 48,
+   "size" : 56,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9082,7 +9094,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" : 48,
+   "size" : 56,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9101,7 +9113,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" : 48,
+   "size" : 56,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
diff --git a/34/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/34/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 0ca7391..6fd3721 100644
--- a/34/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/34/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -1000,6 +1000,9 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
+   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjm"
   },
   {
@@ -11711,11 +11714,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12302,11 +12305,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12887,11 +12890,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14484,6 +14487,37 @@
   },
   {
    "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/x86_64/source-based/libstagefright_foundation.so.lsdump b/34/64/x86_64/source-based/libstagefright_foundation.so.lsdump
index 69d9b0e..995a881 100644
--- a/34/64/x86_64/source-based/libstagefright_foundation.so.lsdump
+++ b/34/64/x86_64/source-based/libstagefright_foundation.so.lsdump
@@ -24072,7 +24072,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_64_static/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_x86_64_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -24114,13 +24114,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_x86_64_static/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_x86_64_static/e560d7b19ebf7276b3e850d3d346dec8/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_x86_64_static/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_x86_64_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/34/64/x86_64/source-based/libstagefright_omx.so.lsdump b/34/64/x86_64/source-based/libstagefright_omx.so.lsdump
index 5fb3cde..677b5ac 100644
--- a/34/64/x86_64/source-based/libstagefright_omx.so.lsdump
+++ b/34/64/x86_64/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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIA_25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -650,6 +650,9 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
+   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjm"
   },
   {
@@ -14018,7 +14021,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14039,7 +14042,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
     }
    ],
    "referenced_type" : "_ZTIF13OMX_ERRORTYPEjP20OMX_BUFFERHEADERTYPEE",
@@ -14057,7 +14060,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14084,7 +14087,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14111,7 +14114,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -14243,7 +14246,7 @@
      "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
     }
    ],
    "referenced_type" : "_ZTIF13OMX_ERRORTYPEjjP20OMX_BUFFERHEADERTYPEE",
@@ -15724,6 +15727,37 @@
   },
   {
    "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" :
    [
@@ -20387,8 +20421,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIP16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -20441,8 +20475,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -21044,8 +21078,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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"
   },
@@ -21908,8 +21942,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -22952,8 +22986,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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"
   },
@@ -23132,8 +23166,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTIPP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -23518,8 +23552,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIKN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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"
   },
@@ -24551,8 +24585,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI12OMX_MARKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 8,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h"
   },
@@ -24752,8 +24786,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI16OMX_CALLBACKTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 24,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -25015,8 +25049,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI17OMX_COMPONENTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 160,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -25449,8 +25483,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 80,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27722,8 +27756,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
-   "self_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_COMPONENTREGISTERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -27908,8 +27942,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI25OMX_PARAM_CONTENTPIPETYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 12,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29231,8 +29265,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI27OMX_CONFIG_METADATAITEMTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 180,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29519,8 +29553,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 16,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -29707,8 +29741,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 40,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -29947,7 +29981,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "bBuffersContiguous",
@@ -29962,8 +29996,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_PARAM_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 96,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -30161,8 +30195,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h"
   },
@@ -30519,8 +30553,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI30OMX_CONFIG_CONTAINERNODEIDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -32142,8 +32176,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI36OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h"
   },
@@ -32244,8 +32278,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTI37OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 32,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
@@ -32892,15 +32926,15 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_AUDIO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_VIDEO_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTI28OMX_IMAGE_PORTDEFINITIONTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "field_name" : "other",
@@ -32911,8 +32945,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN28OMX_PARAM_PORTDEFINITIONTYPEUt_E#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
    "size" : 48,
    "source_file" : "frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -33500,13 +33534,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump",
     "_ZTIj"
    ]
   },
@@ -33546,13 +33580,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+    "_ZTIPN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
     "_ZTIN7android2wpINS_4hidl4base4V1_05IBaseEEE"
    ]
   },
@@ -33638,14 +33672,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ]
   },
   {
@@ -34636,13 +34670,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
+    "_ZTIP20OMX_BUFFERHEADERTYPE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/OmxGraphicBufferSource.sdump"
    ],
    "vtable_components" :
    [
@@ -35680,7 +35714,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIPN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35770,13 +35804,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIjP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIP20OMX_BUFFERHEADERTYPEjEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35872,13 +35906,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android12SortedVectorIP20OMX_BUFFERHEADERTYPEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "private",
@@ -35889,8 +35923,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android15OMXNodeInstanceE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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" :
@@ -43312,7 +43346,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
+     "referenced_type" : "_ZTIN7android11KeyedVectorIPNS_15OMXNodeInstanceENS_2wpINS_4hidl4base4V1_05IBaseEEEEE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump"
     },
     {
      "access" : "protected",
@@ -43323,8 +43357,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_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
-   "self_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_shared/obj/frameworks/av/media/libstagefright/omx/1.0/WGraphicBufferSource.sdump",
+   "referenced_type" : "_ZTIN7android8hardware5media3omx4V1_014implementation3OmxE#ODR:out/soong/.intermediates/frameworks/av/media/libstagefright/omx/libstagefright_omx/android_vendor.34_x86_64_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_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/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" :
@@ -45357,6 +45391,15 @@
   },
   {
    "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/x86_64/source-based/libstagefright_omx_utils.so.lsdump b/34/64/x86_64/source-based/libstagefright_omx_utils.so.lsdump
index 794089c..ff19961 100644
--- a/34/64/x86_64/source-based/libstagefright_omx_utils.so.lsdump
+++ b/34/64/x86_64/source-based/libstagefright_omx_utils.so.lsdump
@@ -9853,11 +9853,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24604,6 +24604,12 @@
     },
     {
      "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/x86_64/source-based/libtinyalsa.so.lsdump b/34/64/x86_64/source-based/libtinyalsa.so.lsdump
index 3bd99c0..2db911b 100644
--- a/34/64/x86_64/source-based/libtinyalsa.so.lsdump
+++ b/34/64/x86_64/source-based/libtinyalsa.so.lsdump
@@ -218,6 +218,9 @@
    "name" : "pcm_get_subdevice"
   },
   {
+   "name" : "pcm_get_xruns"
+  },
+  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1298,6 +1301,18 @@
    "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/x86_64/source-based/libui.so.lsdump b/34/64/x86_64/source-based/libui.so.lsdump
index f073f23..619eab1 100644
--- a/34/64/x86_64/source-based/libui.so.lsdump
+++ b/34/64/x86_64/source-based/libui.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA12_m",
    "size" : 96,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIm",
    "self_type" : "_ZTIA25_m",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -133,7 +133,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -859,10 +859,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -871,18 +867,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1213,6 +1201,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1452,34 +1444,6 @@
    "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"
   },
   {
@@ -1507,10 +1471,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1527,10 +1487,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1550,10 +1506,6 @@
    "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"
   },
   {
@@ -2342,10 +2294,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_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_"
   },
   {
@@ -2358,10 +2306,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_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"
   },
   {
@@ -2378,18 +2322,10 @@
   },
   {
    "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"
   },
   {
@@ -2402,18 +2338,14 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EmmS9_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lm4EEEED2Ev"
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferINS_4pairINS_8functionIFvPvmEEES3_EERNS_9allocatorIS6_EEED2Ev"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_8weak_ptrIN7android9FenceTimeEEERNS_9allocatorIS4_EEEC2EmmS7_"
   },
   {
@@ -2442,10 +2374,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLm128EEEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2510,14 +2438,6 @@
   },
   {
    "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_"
   },
   {
@@ -2530,26 +2450,10 @@
   },
   {
    "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_"
   },
   {
@@ -2558,15 +2462,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEm"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEm"
   },
   {
    "binding" : "weak",
@@ -2606,14 +2506,6 @@
   },
   {
    "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"
   },
   {
@@ -2630,14 +2522,6 @@
   },
   {
    "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"
   },
   {
@@ -2654,22 +2538,10 @@
   },
   {
    "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"
   },
   {
@@ -2682,17 +2554,9 @@
   },
   {
    "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"
   },
   {
@@ -4007,7 +3871,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -4023,11 +3887,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -4036,7 +3900,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4228,7 +4092,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4244,71 +4108,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4628,7 +4492,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4636,7 +4500,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7398,7 +7262,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8380,11 +8244,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8971,11 +8835,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9556,11 +9420,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10872,7 +10736,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10890,7 +10754,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10923,7 +10787,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10938,7 +10802,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10956,7 +10820,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10974,7 +10838,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11001,7 +10865,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11046,7 +10910,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11064,7 +10928,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11085,7 +10949,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11109,7 +10973,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11145,7 +11009,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11184,7 +11048,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11220,7 +11084,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11259,7 +11123,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11292,7 +11156,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11310,7 +11174,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11346,7 +11210,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11367,7 +11231,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14513,19 +14377,6 @@
    "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" :
@@ -14555,22 +14406,6 @@
    "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" :
@@ -14587,22 +14422,6 @@
    "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" :
@@ -16285,6 +16104,12 @@
    "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" :
@@ -22202,7 +22027,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22211,7 +22036,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22256,7 +22081,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22292,7 +22117,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22301,7 +22126,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22391,7 +22216,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22400,7 +22225,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22409,7 +22234,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22418,7 +22243,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22427,7 +22252,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22436,7 +22261,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22445,7 +22270,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22463,7 +22288,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22472,7 +22297,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22481,7 +22306,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22490,7 +22315,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22499,7 +22324,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22508,7 +22333,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22517,7 +22342,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22526,7 +22351,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22535,7 +22360,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22544,7 +22369,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22562,7 +22387,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -22571,7 +22396,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
@@ -22598,7 +22423,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -22625,7 +22450,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -25550,7 +25375,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -25690,7 +25515,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25728,7 +25553,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28275,7 +28100,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 120,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28331,7 +28156,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 248,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28495,7 +28320,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 200,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28592,7 +28417,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 344,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 8,
@@ -28751,7 +28576,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 8,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -28939,7 +28764,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 288,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 8,
diff --git a/34/64/x86_64/source-based/libunwindstack.so.lsdump b/34/64/x86_64/source-based/libunwindstack.so.lsdump
index 0199cd0..18e8d97 100644
--- a/34/64/x86_64/source-based/libunwindstack.so.lsdump
+++ b/34/64/x86_64/source-based/libunwindstack.so.lsdump
@@ -101,24 +101,6 @@
    "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]",
@@ -238,402 +220,369 @@
    "name" : "AsmGetRegs"
   },
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
+   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
+   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
   },
   {
-   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
+   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
+   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
   },
   {
-   "name" : "_RNvXs7_Cs5OIsIcU3KsB_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs6_NtCsigYXxsQj60g_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
   },
   {
-   "name" : "_RNvXs7_Csjhy8uZQdWLM_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs6_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_7Display3fmt"
   },
   {
-   "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" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
    "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcmEEE"
-  },
-  {
-   "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"
   },
   {
@@ -2522,45 +2471,6 @@
    "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"
   },
   {
@@ -3305,10 +3215,13 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
   },
   {
    "binding" : "weak",
@@ -3369,9 +3282,6 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
-   "name" : "_ZTVN11unwindstack10RegsMips64E"
-  },
-  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3563,9 +3473,6 @@
    "name" : "_ZTVN11unwindstack8RegsImplImEE"
   },
   {
-   "name" : "_ZTVN11unwindstack8RegsMipsE"
-  },
-  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3629,6 +3536,9 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
+  },
+  {
+   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3800,48 +3710,6 @@
    "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" :
    [
@@ -4172,163 +4040,6 @@
    "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" :
    [
@@ -4354,14 +4065,6 @@
     },
     {
      "enum_field_value" : 5,
-     "name" : "unwindstack::ARCH_MIPS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "unwindstack::ARCH_MIPS64"
-    },
-    {
-     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4629,163 +4332,6 @@
    [
     {
      "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"
     },
     {
@@ -4891,194 +4437,6 @@
    "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" :
@@ -7810,194 +7168,6 @@
    "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",
@@ -8930,15 +8100,6 @@
   },
   {
    "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",
@@ -9299,15 +8460,6 @@
   },
   {
    "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",
@@ -9824,82 +8976,6 @@
      "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",
@@ -10623,32 +9699,6 @@
    "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" :
    [
@@ -10995,48 +10045,6 @@
      "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"
@@ -11430,68 +10438,6 @@
   },
   {
    "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" :
    [
     {
@@ -11894,22 +10840,6 @@
    "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"
     }
@@ -12072,103 +11002,6 @@
    "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"
     }
@@ -13752,82 +12585,6 @@
   },
   {
    "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/x86_64/source-based/libutils.so.lsdump b/34/64/x86_64/source-based/libutils.so.lsdump
index 0e9f8c9..824acfb 100644
--- a/34/64/x86_64/source-based/libutils.so.lsdump
+++ b/34/64/x86_64/source-based/libutils.so.lsdump
@@ -492,10 +492,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -741,9 +737,6 @@
    "name" : "_ZN7android7String813appendFormatVEPKcP13__va_list_tag"
   },
   {
-   "name" : "_ZN7android7String816convertToResPathEv"
-  },
-  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1222,10 +1215,6 @@
   },
   {
    "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_"
   },
   {
@@ -1246,18 +1235,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_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_"
   },
   {
@@ -1281,10 +1262,6 @@
    "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"
   },
   {
@@ -5755,19 +5732,6 @@
    "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" :
@@ -7043,19 +7007,6 @@
    "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/x86_64/source-based/libxml2.so.lsdump b/34/64/x86_64/source-based/libxml2.so.lsdump
index 5a10b53..d0f6925 100644
--- a/34/64/x86_64/source-based/libxml2.so.lsdump
+++ b/34/64/x86_64/source-based/libxml2.so.lsdump
@@ -718,6 +718,9 @@
    "name" : "xmlCtxtResetPush"
   },
   {
+   "name" : "xmlCtxtSetMaxAmplification"
+  },
+  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1402,6 +1405,9 @@
    "name" : "xmlMemShow"
   },
   {
+   "name" : "xmlMemSize"
+  },
+  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1915,6 +1921,9 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
+   "name" : "xmlParserInputBufferCreateString"
+  },
+  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3001,6 +3010,9 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
+   "name" : "xmlTextReaderSetMaxAmplification"
+  },
+  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5389,6 +5401,43 @@
    "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"
     },
@@ -5971,6 +6020,10 @@
      "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"
     },
@@ -9490,6 +9543,10 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -13970,6 +14027,21 @@
    "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" :
@@ -17219,6 +17291,18 @@
    "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" :
@@ -19742,6 +19826,18 @@
    "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" :
@@ -22618,7 +22714,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25406,6 +25502,21 @@
    "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" :
@@ -35298,13 +35409,18 @@
      "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" : 760,
+   "size" : 768,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -35988,7 +36104,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "standalone",
+     "field_name" : "flags",
      "field_offset" : 768,
      "referenced_type" : "_ZTIi"
     },
diff --git a/34/64/x86_64/source-based/libyuv.so.lsdump b/34/64/x86_64/source-based/libyuv.so.lsdump
index 1489454..c0dfbbf 100644
--- a/34/64/x86_64/source-based/libyuv.so.lsdump
+++ b/34/64/x86_64/source-based/libyuv.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIs",
    "self_type" : "_ZTIA16_s",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -17,7 +17,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA256_j",
    "size" : 1024,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 1,
@@ -26,7 +26,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA32_h",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -184,12 +184,36 @@
    "name" : "ABGRToI420"
   },
   {
+   "name" : "ABGRToJ400"
+  },
+  {
+   "name" : "ABGRToJ420"
+  },
+  {
+   "name" : "ABGRToJ422"
+  },
+  {
    "name" : "ABGRToNV12"
   },
   {
    "name" : "ABGRToNV21"
   },
   {
+   "name" : "ABGRToUVJRow_AVX2"
+  },
+  {
+   "name" : "ABGRToUVJRow_Any_AVX2"
+  },
+  {
+   "name" : "ABGRToUVJRow_Any_SSSE3"
+  },
+  {
+   "name" : "ABGRToUVJRow_C"
+  },
+  {
+   "name" : "ABGRToUVJRow_SSSE3"
+  },
+  {
    "name" : "ABGRToUVRow_AVX2"
   },
   {
@@ -205,6 +229,21 @@
    "name" : "ABGRToUVRow_SSSE3"
   },
   {
+   "name" : "ABGRToYJRow_AVX2"
+  },
+  {
+   "name" : "ABGRToYJRow_Any_AVX2"
+  },
+  {
+   "name" : "ABGRToYJRow_Any_SSSE3"
+  },
+  {
+   "name" : "ABGRToYJRow_C"
+  },
+  {
+   "name" : "ABGRToYJRow_SSSE3"
+  },
+  {
    "name" : "ABGRToYRow_AVX2"
   },
   {
@@ -694,6 +733,9 @@
    "name" : "ARGBToI420"
   },
   {
+   "name" : "ARGBToI420Alpha"
+  },
+  {
    "name" : "ARGBToI422"
   },
   {
@@ -1081,6 +1123,24 @@
    "name" : "DetilePlane"
   },
   {
+   "name" : "DetilePlane_16"
+  },
+  {
+   "name" : "DetileRow_16_AVX"
+  },
+  {
+   "name" : "DetileRow_16_Any_AVX"
+  },
+  {
+   "name" : "DetileRow_16_Any_SSE2"
+  },
+  {
+   "name" : "DetileRow_16_C"
+  },
+  {
+   "name" : "DetileRow_16_SSE2"
+  },
+  {
    "name" : "DetileRow_Any_SSE2"
   },
   {
@@ -1102,6 +1162,18 @@
    "name" : "DetileSplitUVRow_SSSE3"
   },
   {
+   "name" : "DetileToYUY2"
+  },
+  {
+   "name" : "DetileToYUY2_Any_SSE2"
+  },
+  {
+   "name" : "DetileToYUY2_C"
+  },
+  {
+   "name" : "DetileToYUY2_SSE2"
+  },
+  {
    "name" : "DivideRow_16_AVX2"
   },
   {
@@ -1141,9 +1213,6 @@
    "name" : "GetARGBBlend"
   },
   {
-   "name" : "GetXCR0"
-  },
-  {
    "name" : "H010ToAB30"
   },
   {
@@ -1261,6 +1330,9 @@
    "name" : "I010Copy"
   },
   {
+   "name" : "I010Rotate"
+  },
+  {
    "name" : "I010ToAB30"
   },
   {
@@ -1330,6 +1402,9 @@
    "name" : "I210Copy"
   },
   {
+   "name" : "I210Rotate"
+  },
+  {
    "name" : "I210ToAB30"
   },
   {
@@ -1429,6 +1504,9 @@
    "name" : "I212ToARGBRow_SSSE3"
   },
   {
+   "name" : "I212ToI420"
+  },
+  {
    "name" : "I212ToI422"
   },
   {
@@ -1489,6 +1567,12 @@
    "name" : "I410AlphaToARGBRow_SSSE3"
   },
   {
+   "name" : "I410Copy"
+  },
+  {
+   "name" : "I410Rotate"
+  },
+  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1528,9 +1612,15 @@
    "name" : "I410ToI010"
   },
   {
+   "name" : "I410ToI420"
+  },
+  {
    "name" : "I410ToI444"
   },
   {
+   "name" : "I412ToI420"
+  },
+  {
    "name" : "I412ToI444"
   },
   {
@@ -1639,6 +1729,9 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
+   "name" : "I420ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1795,6 +1888,18 @@
    "name" : "I422ToNV21"
   },
   {
+   "name" : "I422ToRAW"
+  },
+  {
+   "name" : "I422ToRGB24"
+  },
+  {
+   "name" : "I422ToRGB24Matrix"
+  },
+  {
+   "name" : "I422ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I422ToRGB24Row_AVX2"
   },
   {
@@ -1813,6 +1918,9 @@
    "name" : "I422ToRGB565"
   },
   {
+   "name" : "I422ToRGB565Matrix"
+  },
+  {
    "name" : "I422ToRGB565Row_AVX2"
   },
   {
@@ -1957,6 +2065,30 @@
    "name" : "I444ToNV21"
   },
   {
+   "name" : "I444ToRAW"
+  },
+  {
+   "name" : "I444ToRGB24"
+  },
+  {
+   "name" : "I444ToRGB24Matrix"
+  },
+  {
+   "name" : "I444ToRGB24Row_AVX2"
+  },
+  {
+   "name" : "I444ToRGB24Row_Any_AVX2"
+  },
+  {
+   "name" : "I444ToRGB24Row_Any_SSSE3"
+  },
+  {
+   "name" : "I444ToRGB24Row_C"
+  },
+  {
+   "name" : "I444ToRGB24Row_SSSE3"
+  },
+  {
    "name" : "InitCpuFlags"
   },
   {
@@ -2053,6 +2185,12 @@
    "name" : "MM21ToNV12"
   },
   {
+   "name" : "MM21ToYUY2"
+  },
+  {
+   "name" : "MT2TToP010"
+  },
+  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -2083,12 +2221,6 @@
    "name" : "MergeARGBPlane"
   },
   {
-   "name" : "MergeARGBPlaneAlpha"
-  },
-  {
-   "name" : "MergeARGBPlaneOpaque"
-  },
-  {
    "name" : "MergeARGBRow_AVX2"
   },
   {
@@ -2134,9 +2266,15 @@
    "name" : "MergeUVRow_AVX2"
   },
   {
+   "name" : "MergeUVRow_AVX512BW"
+  },
+  {
    "name" : "MergeUVRow_Any_AVX2"
   },
   {
+   "name" : "MergeUVRow_Any_AVX512BW"
+  },
+  {
    "name" : "MergeUVRow_Any_SSE2"
   },
   {
@@ -2197,6 +2335,9 @@
    "name" : "MirrorPlane"
   },
   {
+   "name" : "MirrorRow_16_C"
+  },
+  {
    "name" : "MirrorRow_AVX2"
   },
   {
@@ -2422,9 +2563,15 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
+   "name" : "P010ToI010"
+  },
+  {
    "name" : "P010ToP410"
   },
   {
+   "name" : "P012ToI012"
+  },
+  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2710,6 +2857,9 @@
    "name" : "RGBScale"
   },
   {
+   "name" : "RiscvCpuCaps"
+  },
+  {
    "name" : "RotatePlane"
   },
   {
@@ -2722,6 +2872,9 @@
    "name" : "RotatePlane90"
   },
   {
+   "name" : "RotatePlane_16"
+  },
+  {
    "name" : "Scale"
   },
   {
@@ -2863,6 +3016,9 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
+   "name" : "ScalePlaneDown2_16To8"
+  },
+  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -2896,6 +3052,12 @@
    "name" : "ScalePlane_16"
   },
   {
+   "name" : "ScaleRowDown2Box_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Box_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -2923,6 +3085,12 @@
    "name" : "ScaleRowDown2Box_SSSE3"
   },
   {
+   "name" : "ScaleRowDown2Linear_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -2941,6 +3109,12 @@
    "name" : "ScaleRowDown2Linear_SSSE3"
   },
   {
+   "name" : "ScaleRowDown2_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -3370,12 +3544,6 @@
    "name" : "SplitARGBPlane"
   },
   {
-   "name" : "SplitARGBPlaneAlpha"
-  },
-  {
-   "name" : "SplitARGBPlaneOpaque"
-  },
-  {
    "name" : "SplitARGBRow_AVX2"
   },
   {
@@ -3502,9 +3670,24 @@
    "name" : "SwapUVRow_SSSE3"
   },
   {
+   "name" : "Transpose4x4_32_AVX2"
+  },
+  {
+   "name" : "Transpose4x4_32_C"
+  },
+  {
+   "name" : "Transpose4x4_32_SSE2"
+  },
+  {
    "name" : "TransposePlane"
   },
   {
+   "name" : "TransposePlane_16"
+  },
+  {
+   "name" : "TransposeUVWx8_16_C"
+  },
+  {
    "name" : "TransposeUVWx8_Any_SSE2"
   },
   {
@@ -3517,6 +3700,9 @@
    "name" : "TransposeUVWxH_C"
   },
   {
+   "name" : "TransposeWx8_16_C"
+  },
+  {
    "name" : "TransposeWx8_Any_SSSE3"
   },
   {
@@ -3532,6 +3718,9 @@
    "name" : "TransposeWx8_SSSE3"
   },
   {
+   "name" : "TransposeWxH_16_C"
+  },
+  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -3658,6 +3847,9 @@
    "name" : "UYVYToYRow_SSE2"
   },
   {
+   "name" : "UnpackMT2T_C"
+  },
+  {
    "name" : "ValidateJpeg"
   },
   {
@@ -3691,6 +3883,21 @@
    "name" : "YUY2ToNV12"
   },
   {
+   "name" : "YUY2ToNVUVRow_AVX2"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_Any_AVX2"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_Any_SSE2"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_C"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_SSE2"
+  },
+  {
    "name" : "YUY2ToUV422Row_AVX2"
   },
   {
@@ -3932,7 +4139,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3973,7 +4180,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4006,7 +4213,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4319,7 +4526,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -4568,7 +4775,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -4596,7 +4803,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -4620,7 +4827,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -4650,7 +4857,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_AVX2",
@@ -4668,7 +4875,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_AVX2",
@@ -4686,7 +4893,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_SSSE3",
@@ -4704,7 +4911,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -4722,7 +4929,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_SSSE3",
@@ -4740,7 +4947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4767,7 +4974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_AVX2",
@@ -4785,7 +4992,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_AVX2",
@@ -4803,7 +5010,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_SSSE3",
@@ -4821,7 +5028,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -4839,7 +5046,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_SSSE3",
@@ -4857,7 +5064,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -4884,7 +5091,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -4923,7 +5130,112 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -4956,7 +5268,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -4989,7 +5301,127 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+  },
+  {
+   "function_name" : "libyuv::ABGRToUVJRow_AVX2",
+   "linker_set_key" : "ABGRToUVJRow_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "ABGRToUVJRow_Any_AVX2",
+   "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_Any_SSSE3",
+   "linker_set_key" : "ABGRToUVJRow_Any_SSSE3",
+   "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_SSSE3",
+   "linker_set_key" : "ABGRToUVJRow_SSSE3",
+   "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::ABGRToUVRow_AVX2",
@@ -5013,7 +5445,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_AVX2",
@@ -5037,7 +5469,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_SSSE3",
@@ -5061,7 +5493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -5085,7 +5517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_SSSE3",
@@ -5109,7 +5541,97 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::ABGRToYJRow_AVX2",
+   "linker_set_key" : "ABGRToYJRow_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "ABGRToYJRow_Any_AVX2",
+   "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_Any_SSSE3",
+   "linker_set_key" : "ABGRToYJRow_Any_SSSE3",
+   "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_SSSE3",
+   "linker_set_key" : "ABGRToYJRow_SSSE3",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_AVX2",
@@ -5127,7 +5649,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_AVX2",
@@ -5145,7 +5667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_SSSE3",
@@ -5163,7 +5685,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -5181,7 +5703,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_SSSE3",
@@ -5199,7 +5721,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -5226,7 +5748,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -5244,7 +5766,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -5271,7 +5793,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -5289,7 +5811,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -5316,7 +5838,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -5334,7 +5856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -5364,7 +5886,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -5385,7 +5907,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -5412,7 +5934,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -5439,7 +5961,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_AVX2",
@@ -5457,7 +5979,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_AVX2",
@@ -5475,7 +5997,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_SSSE3",
@@ -5493,7 +6015,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -5511,7 +6033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_SSSE3",
@@ -5529,7 +6051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -5556,7 +6078,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_SSE2",
@@ -5574,7 +6096,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -5592,7 +6114,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_SSE2",
@@ -5610,7 +6132,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -5649,7 +6171,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -5673,7 +6195,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -5691,7 +6213,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -5718,7 +6240,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_SSE2",
@@ -5736,7 +6258,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -5754,7 +6276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_SSE2",
@@ -5772,7 +6294,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -5811,7 +6333,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -5835,7 +6357,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -5853,7 +6375,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -5886,7 +6408,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_AVX2",
@@ -5907,7 +6429,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_AVX2",
@@ -5928,7 +6450,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_SSE2",
@@ -5949,7 +6471,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -5970,7 +6492,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_SSE2",
@@ -5991,7 +6513,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -6015,7 +6537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_SSE2",
@@ -6039,7 +6561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -6066,7 +6588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_AVX2",
@@ -6084,7 +6606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_AVX2",
@@ -6102,7 +6624,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_SSSE3",
@@ -6120,7 +6642,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -6138,7 +6660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_SSSE3",
@@ -6156,7 +6678,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -6189,7 +6711,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -6210,7 +6732,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_SSSE3",
@@ -6231,7 +6753,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -6267,7 +6789,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -6297,7 +6819,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -6318,7 +6840,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_SSSE3",
@@ -6339,7 +6861,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -6369,7 +6891,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -6387,7 +6909,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_X86",
@@ -6405,7 +6927,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -6432,7 +6954,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -6459,7 +6981,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -6486,7 +7008,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_AVX2",
@@ -6504,7 +7026,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_AVX2",
@@ -6522,7 +7044,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_SSE2",
@@ -6540,7 +7062,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -6558,7 +7080,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_SSE2",
@@ -6576,7 +7098,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -6603,7 +7125,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_AVX2",
@@ -6621,7 +7143,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_AVX2",
@@ -6639,7 +7161,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_SSE2",
@@ -6657,7 +7179,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -6675,7 +7197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_SSE2",
@@ -6693,7 +7215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -6714,7 +7236,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -6741,7 +7263,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_AVX2",
@@ -6759,7 +7281,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_AVX2",
@@ -6777,7 +7299,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_SSE2",
@@ -6795,7 +7317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -6813,7 +7335,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_SSE2",
@@ -6831,7 +7353,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -6858,7 +7380,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -6876,7 +7398,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_SSSE3",
@@ -6894,7 +7416,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -6921,7 +7443,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -6957,7 +7479,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -6987,7 +7509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -7011,7 +7533,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_SSSE3",
@@ -7035,7 +7557,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -7062,7 +7584,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_AVX2",
@@ -7080,7 +7602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_AVX2",
@@ -7098,7 +7620,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_SSE2",
@@ -7116,7 +7638,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -7134,7 +7656,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_SSE2",
@@ -7152,7 +7674,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -7185,7 +7707,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_AVX2",
@@ -7206,7 +7728,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_AVX2",
@@ -7227,7 +7749,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_SSE2",
@@ -7248,7 +7770,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -7269,7 +7791,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_SSE2",
@@ -7290,7 +7812,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -7320,7 +7842,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_AVX2",
@@ -7341,7 +7863,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -7362,7 +7884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_SSE2",
@@ -7383,7 +7905,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -7419,7 +7941,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -7443,7 +7965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_SSE2",
@@ -7467,7 +7989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -7497,7 +8019,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -7524,7 +8076,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -7539,7 +8091,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_SSSE3",
@@ -7554,7 +8106,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -7572,7 +8124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_X86",
@@ -7590,7 +8142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -7620,7 +8172,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -7641,7 +8193,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_SSE2",
@@ -7662,7 +8214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -7692,7 +8244,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_AVX2",
@@ -7713,7 +8265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_AVX2",
@@ -7734,7 +8286,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_SSSE3",
@@ -7755,7 +8307,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -7776,7 +8328,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_SSSE3",
@@ -7797,7 +8349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -7824,7 +8376,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -7851,7 +8403,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -7878,7 +8430,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -7911,7 +8463,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_AVX2",
@@ -7932,7 +8484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_AVX2",
@@ -7953,7 +8505,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_SSE2",
@@ -7974,7 +8526,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -7995,7 +8547,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_SSE2",
@@ -8016,7 +8568,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -8043,7 +8595,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_AVX2",
@@ -8061,7 +8613,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_AVX2",
@@ -8079,7 +8631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_SSSE3",
@@ -8097,7 +8649,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -8115,7 +8667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_SSSE3",
@@ -8133,7 +8685,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -8160,7 +8739,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_AVX2",
@@ -8178,7 +8757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_AVX2",
@@ -8196,7 +8775,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_SSSE3",
@@ -8214,7 +8793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -8232,7 +8811,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_SSSE3",
@@ -8250,7 +8829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -8277,7 +8856,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_AVX2",
@@ -8295,7 +8874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_AVX2",
@@ -8313,7 +8892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_SSSE3",
@@ -8331,7 +8910,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -8349,7 +8928,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_SSSE3",
@@ -8367,7 +8946,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -8394,7 +8973,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_SSE2",
@@ -8412,7 +8991,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -8430,7 +9009,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_SSE2",
@@ -8448,7 +9027,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -8475,7 +9054,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_SSE2",
@@ -8493,7 +9072,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -8511,7 +9090,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_SSE2",
@@ -8529,7 +9108,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -8556,7 +9162,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -8595,7 +9201,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -8634,7 +9285,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -8673,7 +9324,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -8700,7 +9351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -8739,7 +9390,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -8778,7 +9429,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -8811,7 +9462,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -8844,7 +9495,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -8871,7 +9522,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_AVX2",
@@ -8889,7 +9540,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_AVX2",
@@ -8907,7 +9558,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_SSSE3",
@@ -8925,7 +9576,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -8943,7 +9594,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_SSSE3",
@@ -8961,7 +9612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -8988,7 +9639,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX2",
@@ -9006,7 +9657,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX512VBMI",
@@ -9024,7 +9675,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX2",
@@ -9042,7 +9693,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX512VBMI",
@@ -9060,7 +9711,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_SSSE3",
@@ -9078,7 +9729,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -9096,7 +9747,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_SSSE3",
@@ -9114,7 +9765,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -9141,7 +9792,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -9171,7 +9822,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_AVX2",
@@ -9185,14 +9836,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_AVX2",
@@ -9213,7 +9864,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_SSE2",
@@ -9234,7 +9885,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -9248,14 +9899,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_SSE2",
@@ -9269,14 +9920,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_SSE2",
@@ -9294,7 +9945,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -9312,7 +9963,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_SSE2",
@@ -9330,7 +9981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -9357,7 +10008,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_SSSE3",
@@ -9378,7 +10029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -9399,7 +10050,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_SSSE3",
@@ -9420,7 +10071,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_AVX2",
@@ -9444,7 +10095,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_AVX2",
@@ -9468,7 +10119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_SSSE3",
@@ -9492,7 +10143,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -9516,7 +10167,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_SSSE3",
@@ -9540,7 +10191,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_AVX2",
@@ -9564,7 +10215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_AVX2",
@@ -9588,7 +10239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_SSSE3",
@@ -9612,7 +10263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -9636,7 +10287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_SSSE3",
@@ -9660,7 +10311,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -9687,7 +10338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_AVX2",
@@ -9705,7 +10356,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_AVX2",
@@ -9723,7 +10374,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_SSSE3",
@@ -9741,7 +10392,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -9759,7 +10410,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_SSSE3",
@@ -9777,7 +10428,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_AVX2",
@@ -9795,7 +10446,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_AVX2",
@@ -9813,7 +10464,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_SSSE3",
@@ -9831,7 +10482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -9849,7 +10500,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_SSSE3",
@@ -9867,7 +10518,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -9894,7 +10545,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -9921,7 +10572,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_AVX2",
@@ -9939,7 +10590,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_AVX2",
@@ -9957,7 +10608,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_SSE2",
@@ -9975,7 +10626,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -9993,7 +10644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_SSE2",
@@ -10011,7 +10662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -10044,7 +10695,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -10077,7 +10728,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -10098,7 +10749,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -10119,7 +10770,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -10137,7 +10788,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -10179,7 +10830,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -10221,7 +10872,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -10266,7 +10917,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -10320,7 +10971,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -10377,7 +11028,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -10389,7 +11040,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -10416,7 +11067,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -10455,7 +11106,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_SSSE3",
@@ -10479,7 +11130,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -10503,7 +11154,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_SSSE3",
@@ -10527,7 +11178,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_SSSE3",
@@ -10545,7 +11196,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -10563,7 +11214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_SSSE3",
@@ -10581,7 +11232,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -10620,7 +11271,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_AVX2",
@@ -10644,7 +11295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_AVX2",
@@ -10668,7 +11319,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_SSSE3",
@@ -10692,7 +11343,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -10716,7 +11367,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_SSSE3",
@@ -10740,7 +11391,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -10761,7 +11412,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -10782,7 +11433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -10809,7 +11460,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -10836,7 +11487,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -10848,7 +11499,25 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
+   "source_file" : "external/libyuv/include/libyuv/video_common.h"
+  },
+  {
+   "function_name" : "libyuv::ClampFloatToZero_SSE2",
+   "linker_set_key" : "ClampFloatToZero_SSE2",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -10869,7 +11538,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_SSE2",
@@ -10890,7 +11559,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -10908,7 +11577,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -10926,7 +11595,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -10953,7 +11622,7 @@
     }
    ],
    "return_type" : "_ZTIm",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -10983,7 +11652,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_AVX2",
@@ -11004,7 +11673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_AVX2",
@@ -11025,7 +11694,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_SSSE3",
@@ -11046,7 +11715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -11067,7 +11736,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_SSSE3",
@@ -11088,7 +11757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -11118,7 +11787,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_AVX2",
@@ -11139,7 +11808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_AVX2",
@@ -11160,7 +11829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_SSE2",
@@ -11181,7 +11850,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -11202,7 +11871,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_SSE2",
@@ -11223,7 +11892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -11265,7 +11934,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -11310,7 +11979,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -11367,7 +12036,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -11397,7 +12066,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -11427,7 +12096,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -11454,7 +12123,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -11481,7 +12150,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -11499,7 +12168,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_AVX",
@@ -11517,7 +12186,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_AVX",
@@ -11535,7 +12204,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_SSE2",
@@ -11553,7 +12222,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -11571,7 +12240,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_ERMS",
@@ -11589,7 +12258,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_SSE2",
@@ -11607,7 +12276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -11625,7 +12294,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -11652,7 +12321,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_SSE2",
@@ -11679,7 +12348,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -11708,8 +12377,143 @@
      "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_AVX",
+   "linker_set_key" : "DetileRow_16_AVX",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKt"
+    },
+    {
+     "referenced_type" : "_ZTIl"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::DetileRow_16_Any_AVX",
+   "linker_set_key" : "DetileRow_16_Any_AVX",
+   "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_Any_SSE2",
+   "linker_set_key" : "DetileRow_16_Any_SSE2",
+   "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_SSE2",
+   "linker_set_key" : "DetileRow_16_SSE2",
+   "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_Any_SSE2",
@@ -11730,7 +12534,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -11751,7 +12555,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_SSE2",
@@ -11772,7 +12576,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -11808,7 +12612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_SSSE3",
@@ -11832,7 +12636,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -11856,7 +12660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_SSSE3",
@@ -11880,7 +12684,124 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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_SSE2",
+   "linker_set_key" : "DetileToYUY2_Any_SSE2",
+   "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_SSE2",
+   "linker_set_key" : "DetileToYUY2_SSE2",
+   "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::DivideRow_16_AVX2",
@@ -11901,7 +12822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_AVX2",
@@ -11922,7 +12843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -11943,7 +12864,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -11958,7 +12879,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_X86",
@@ -11973,7 +12894,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -11988,7 +12909,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_X86",
@@ -12003,7 +12924,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -12033,7 +12984,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -12060,7 +13011,25 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -12078,13 +13047,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -12123,7 +13092,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -12162,7 +13131,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -12201,7 +13170,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -12240,7 +13209,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -12279,7 +13248,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -12318,7 +13287,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -12357,7 +13326,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -12396,7 +13365,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -12435,7 +13404,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -12474,7 +13443,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -12513,7 +13482,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -12552,7 +13521,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -12591,7 +13560,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -12630,7 +13599,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -12669,7 +13638,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -12708,7 +13677,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -12747,7 +13716,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -12786,7 +13755,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -12825,7 +13794,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -12855,7 +13824,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_AVX2",
@@ -12876,7 +13845,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_AVX2",
@@ -12897,7 +13866,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_SSE2",
@@ -12918,7 +13887,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -12939,7 +13908,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_SSE2",
@@ -12960,7 +13929,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -12993,7 +13962,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_AVX2",
@@ -13020,7 +13989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -13047,7 +14016,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_SSSE3",
@@ -13074,7 +14043,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_AVX2",
@@ -13092,7 +14061,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -13110,7 +14079,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSE42",
@@ -13128,7 +14097,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSSE3",
@@ -13146,7 +14115,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -13164,7 +14133,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -13182,7 +14151,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_SSE41",
@@ -13200,7 +14169,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -13251,7 +14220,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -13305,7 +14274,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -13356,7 +14325,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -13395,7 +14418,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -13434,7 +14457,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -13473,7 +14496,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -13515,7 +14538,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -13560,7 +14583,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -13599,7 +14622,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -13641,7 +14664,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -13686,7 +14709,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -13737,7 +14760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -13788,7 +14811,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -13833,7 +14856,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -13875,7 +14898,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -13917,7 +14940,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -13968,7 +14991,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -14013,7 +15036,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -14064,7 +15087,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -14118,7 +15141,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_AVX2",
@@ -14148,7 +15171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_Any_AVX2",
@@ -14178,7 +15201,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_Any_SSSE3",
@@ -14208,7 +15231,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -14238,7 +15261,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_SSSE3",
@@ -14268,7 +15291,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -14319,7 +15342,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -14358,7 +15435,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -14397,7 +15474,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -14436,7 +15513,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -14478,7 +15555,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -14523,7 +15600,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_AVX2",
@@ -14550,7 +15627,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_AVX2",
@@ -14577,7 +15654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_SSSE3",
@@ -14604,7 +15681,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -14631,7 +15708,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_SSSE3",
@@ -14658,7 +15735,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -14697,7 +15774,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -14739,7 +15816,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -14784,7 +15861,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_AVX2",
@@ -14811,7 +15888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_AVX2",
@@ -14838,7 +15915,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_SSSE3",
@@ -14865,7 +15942,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -14892,7 +15969,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_SSSE3",
@@ -14919,7 +15996,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -14970,7 +16047,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -15021,7 +16098,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -15072,7 +16149,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -15123,7 +16200,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -15168,7 +16245,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_AVX2",
@@ -15195,7 +16272,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_AVX2",
@@ -15222,7 +16299,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_SSSE3",
@@ -15249,7 +16326,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -15276,7 +16353,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_SSSE3",
@@ -15303,7 +16380,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_AVX2",
@@ -15330,7 +16407,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_AVX2",
@@ -15357,7 +16434,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_SSSE3",
@@ -15384,7 +16461,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -15411,7 +16488,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_SSSE3",
@@ -15438,7 +16515,58 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -15489,7 +16617,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -15534,7 +16662,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -15561,7 +16689,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -15588,7 +16716,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -15615,7 +16743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -15645,7 +16773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_AVX2",
@@ -15666,7 +16794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_AVX2",
@@ -15687,7 +16815,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_SSE2",
@@ -15708,7 +16836,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -15729,7 +16857,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_SSE2",
@@ -15750,7 +16878,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -15777,7 +16905,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -15816,7 +16944,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -15849,7 +16977,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -15900,7 +17028,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_AVX2",
@@ -15930,7 +17058,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_Any_AVX2",
@@ -15960,7 +17088,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_Any_SSSE3",
@@ -15990,7 +17118,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -16020,7 +17148,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_SSSE3",
@@ -16050,7 +17178,112 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -16092,7 +17325,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_AVX2",
@@ -16119,7 +17352,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_AVX2",
@@ -16146,7 +17379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_SSSE3",
@@ -16173,7 +17406,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -16200,7 +17433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_SSSE3",
@@ -16227,7 +17460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -16269,7 +17502,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_AVX2",
@@ -16296,7 +17529,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_AVX2",
@@ -16323,7 +17556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_SSSE3",
@@ -16350,7 +17583,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -16377,7 +17610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_SSSE3",
@@ -16404,7 +17637,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -16455,7 +17688,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -16506,7 +17790,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -16557,7 +17892,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -16605,7 +17940,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -16653,7 +17988,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -16704,7 +18039,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -16758,7 +18093,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -16833,7 +18168,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -16884,7 +18219,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -16956,7 +18291,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -17007,7 +18342,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -17058,7 +18393,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -17106,7 +18441,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -17160,7 +18495,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -17220,7 +18555,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -17280,7 +18615,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -17340,7 +18675,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -17391,7 +18726,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -17430,7 +18765,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -17469,7 +18804,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -17508,7 +18843,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -17550,7 +18885,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -17589,7 +18924,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -17628,7 +18963,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -17667,7 +19002,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -17709,7 +19044,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -17754,7 +19089,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -17793,7 +19128,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -17844,7 +19179,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -17895,7 +19230,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -17934,7 +19269,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -17985,7 +19320,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -18036,7 +19371,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -18081,7 +19416,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -18126,7 +19461,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -18165,7 +19500,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -18204,7 +19539,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -18246,7 +19581,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -18285,7 +19665,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -18327,7 +19707,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -18369,7 +19749,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -18408,7 +19788,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -18450,7 +19830,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -18489,7 +19869,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -18528,7 +19908,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -18576,7 +19956,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -18624,7 +20004,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -18675,7 +20055,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -18729,7 +20109,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_AVX2",
@@ -18759,7 +20139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_AVX2",
@@ -18789,7 +20169,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_SSSE3",
@@ -18819,7 +20199,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -18849,7 +20229,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_SSSE3",
@@ -18879,7 +20259,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -18930,7 +20310,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -18984,7 +20364,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -19044,7 +20424,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -19104,7 +20484,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -19164,7 +20544,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -19203,7 +20583,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_AVX2",
@@ -19230,7 +20610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_AVX2",
@@ -19257,7 +20637,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_SSSE3",
@@ -19284,7 +20664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -19311,7 +20691,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_SSSE3",
@@ -19338,7 +20718,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -19377,7 +20757,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_AVX2",
@@ -19404,7 +20784,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_AVX2",
@@ -19431,7 +20811,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_SSSE3",
@@ -19458,7 +20838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -19485,7 +20865,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_SSSE3",
@@ -19512,7 +20892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_AVX2",
@@ -19539,7 +20919,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_AVX2",
@@ -19566,7 +20946,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_SSSE3",
@@ -19593,7 +20973,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -19620,7 +21000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_SSSE3",
@@ -19647,7 +21027,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -19689,7 +21069,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -19734,7 +21114,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_AVX2",
@@ -19761,7 +21141,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_AVX512BW",
@@ -19788,7 +21168,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_AVX2",
@@ -19815,7 +21195,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_AVX512BW",
@@ -19842,7 +21222,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_SSSE3",
@@ -19869,7 +21249,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -19896,7 +21276,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_SSSE3",
@@ -19923,7 +21303,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -19962,7 +21342,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -20013,7 +21393,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -20064,7 +21444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -20115,7 +21495,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -20160,7 +21540,172 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_AVX2",
@@ -20187,7 +21732,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_AVX2",
@@ -20214,7 +21759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_SSSE3",
@@ -20241,7 +21786,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -20268,7 +21813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_SSSE3",
@@ -20295,7 +21840,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -20334,7 +21879,49 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_AVX2",
@@ -20361,7 +21948,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_AVX2",
@@ -20388,7 +21975,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_SSSE3",
@@ -20415,7 +22002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -20442,7 +22029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_SSSE3",
@@ -20469,7 +22056,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -20508,7 +22095,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -20550,7 +22137,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_AVX2",
@@ -20577,7 +22164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_AVX2",
@@ -20604,7 +22191,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_SSSE3",
@@ -20631,7 +22218,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -20658,7 +22245,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_SSSE3",
@@ -20685,7 +22272,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -20724,7 +22311,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_AVX2",
@@ -20748,7 +22335,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_AVX2",
@@ -20772,7 +22359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_SSE2",
@@ -20796,7 +22383,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -20820,7 +22407,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_SSE2",
@@ -20844,7 +22431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -20883,7 +22470,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_AVX2",
@@ -20907,7 +22494,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_AVX2",
@@ -20931,7 +22518,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_SSE2",
@@ -20955,7 +22542,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -20979,7 +22566,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_SSE2",
@@ -21003,7 +22590,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -21051,7 +22638,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -21099,7 +22686,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -21150,7 +22737,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_AVX2",
@@ -21180,7 +22767,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_AVX2",
@@ -21210,7 +22797,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_SSSE3",
@@ -21240,7 +22827,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -21270,7 +22857,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_SSSE3",
@@ -21300,7 +22887,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -21351,7 +22938,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -21405,7 +22992,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -21465,7 +23052,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -21525,7 +23112,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -21585,7 +23172,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -21624,7 +23211,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -21663,7 +23250,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -21705,7 +23292,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_AVX2",
@@ -21732,7 +23319,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_AVX2",
@@ -21759,7 +23346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_SSSE3",
@@ -21786,7 +23373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -21813,7 +23400,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_SSSE3",
@@ -21840,7 +23427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -21891,7 +23478,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -21936,7 +23523,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -21981,13 +23568,268 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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_AVX2",
+   "linker_set_key" : "I444ToRGB24Row_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "I444ToRGB24Row_Any_AVX2",
+   "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_Any_SSSE3",
+   "linker_set_key" : "I444ToRGB24Row_Any_SSSE3",
+   "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_SSSE3",
+   "linker_set_key" : "I444ToRGB24Row_SSSE3",
+   "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::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -22023,7 +23865,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -22059,7 +23901,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_AVX2",
@@ -22086,7 +23928,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_Any_AVX2",
@@ -22113,7 +23955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -22140,7 +23982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -22164,7 +24006,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_AVX2",
@@ -22188,7 +24030,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_AVX2",
@@ -22212,7 +24054,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_SSSE3",
@@ -22236,7 +24078,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -22260,7 +24102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_SSSE3",
@@ -22284,7 +24126,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -22311,7 +24153,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_SSE2",
@@ -22329,7 +24171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -22347,7 +24189,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_SSE2",
@@ -22365,7 +24207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -22404,7 +24246,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -22443,7 +24285,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -22482,7 +24324,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -22521,7 +24363,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -22560,7 +24402,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -22599,7 +24441,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -22638,7 +24480,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -22677,7 +24519,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -22716,7 +24558,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -22737,7 +24579,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -22770,7 +24612,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -22815,7 +24657,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -22854,7 +24696,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -22893,7 +24735,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -22938,7 +24780,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -22977,7 +24819,79 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -22989,7 +24903,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -23037,7 +24951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_AVX2",
@@ -23067,7 +24981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_AVX2",
@@ -23097,7 +25011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -23127,7 +25041,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -23175,7 +25089,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_AVX2",
@@ -23205,7 +25119,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_AVX2",
@@ -23235,7 +25149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -23265,7 +25179,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -23310,7 +25224,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_AVX2",
@@ -23337,7 +25251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_AVX2",
@@ -23364,7 +25278,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_SSE2",
@@ -23391,7 +25305,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -23418,7 +25332,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_SSE2",
@@ -23445,7 +25359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -23484,7 +25398,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_Any_SSSE3",
@@ -23508,7 +25422,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -23532,7 +25446,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_SSSE3",
@@ -23556,7 +25470,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -23589,7 +25503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -23625,7 +25539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_AVX2",
@@ -23649,7 +25563,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_AVX2",
@@ -23673,7 +25587,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -23697,7 +25611,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_AVX2",
@@ -23718,7 +25632,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::MergeUVRow_AVX512BW",
+   "linker_set_key" : "MergeUVRow_AVX512BW",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_AVX2",
@@ -23739,7 +25674,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::MergeUVRow_Any_AVX512BW",
+   "linker_set_key" : "MergeUVRow_Any_AVX512BW",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_SSE2",
@@ -23760,7 +25716,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -23781,7 +25737,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_SSE2",
@@ -23802,7 +25758,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -23844,7 +25800,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_AVX2",
@@ -23871,7 +25827,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_AVX2",
@@ -23898,7 +25854,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -23925,7 +25881,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_AVX2",
@@ -23952,7 +25908,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_AVX2",
@@ -23979,7 +25935,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -24006,7 +25962,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_AVX2",
@@ -24033,7 +25989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_AVX2",
@@ -24060,7 +26016,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -24087,7 +26043,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_AVX2",
@@ -24111,7 +26067,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_AVX2",
@@ -24135,7 +26091,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_SSE2",
@@ -24159,7 +26115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -24183,7 +26139,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_SSE2",
@@ -24207,7 +26163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -24219,7 +26175,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -24246,7 +26202,25 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MirrorRow_AVX2",
@@ -24264,7 +26238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_AVX2",
@@ -24282,7 +26256,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_SSSE3",
@@ -24300,7 +26274,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -24318,7 +26292,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_SSSE3",
@@ -24336,7 +26310,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -24357,7 +26331,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_SSSE3",
@@ -24378,7 +26352,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -24405,7 +26379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_AVX2",
@@ -24423,7 +26397,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_AVX2",
@@ -24441,7 +26415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_SSSE3",
@@ -24459,7 +26433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -24477,7 +26451,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_SSSE3",
@@ -24495,7 +26469,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_AVX2",
@@ -24516,7 +26490,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_AVX2",
@@ -24537,7 +26511,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -24558,7 +26532,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -24597,7 +26571,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -24636,7 +26610,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -24684,7 +26658,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -24717,7 +26691,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -24750,7 +26724,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -24786,7 +26760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_AVX2",
@@ -24810,7 +26784,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_AVX2",
@@ -24834,7 +26808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_SSSE3",
@@ -24858,7 +26832,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -24882,7 +26856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_SSSE3",
@@ -24906,7 +26880,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -24951,7 +26925,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -24999,7 +26973,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -25038,7 +27012,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -25071,7 +27045,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -25104,7 +27078,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -25140,7 +27114,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_AVX2",
@@ -25164,7 +27138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_AVX2",
@@ -25188,7 +27162,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_SSSE3",
@@ -25212,7 +27186,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -25236,7 +27210,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_SSSE3",
@@ -25260,7 +27234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -25293,7 +27267,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -25329,7 +27303,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_AVX2",
@@ -25353,7 +27327,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_AVX2",
@@ -25377,7 +27351,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_SSSE3",
@@ -25401,7 +27375,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -25425,7 +27399,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_SSSE3",
@@ -25449,7 +27423,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -25488,7 +27462,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -25527,7 +27501,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -25560,7 +27534,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -25593,7 +27567,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -25629,7 +27603,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_AVX2",
@@ -25653,7 +27627,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_AVX2",
@@ -25677,7 +27651,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_SSSE3",
@@ -25701,7 +27675,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -25725,7 +27699,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_SSSE3",
@@ -25749,7 +27723,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -25794,7 +27768,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -25833,7 +27807,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -25866,7 +27840,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -25899,7 +27873,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -25935,7 +27909,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_AVX2",
@@ -25959,7 +27933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_AVX2",
@@ -25983,7 +27957,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_SSSE3",
@@ -26007,7 +27981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -26031,7 +28005,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_SSSE3",
@@ -26055,7 +28029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -26088,7 +28062,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_AVX2",
@@ -26109,7 +28083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_AVX2",
@@ -26130,7 +28104,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_SSSE3",
@@ -26151,7 +28125,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -26172,7 +28146,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_SSSE3",
@@ -26193,7 +28167,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -26229,7 +28203,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -26268,7 +28242,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -26304,7 +28278,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -26343,7 +28317,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -26382,7 +28401,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -26418,7 +28482,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -26457,7 +28521,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_AVX2",
@@ -26481,7 +28545,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_AVX2",
@@ -26505,7 +28569,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_SSSE3",
@@ -26529,7 +28593,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -26553,7 +28617,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_SSSE3",
@@ -26577,7 +28641,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -26613,7 +28677,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -26652,7 +28716,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_AVX2",
@@ -26676,7 +28740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_AVX2",
@@ -26700,7 +28764,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_SSSE3",
@@ -26724,7 +28788,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -26748,7 +28812,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_SSSE3",
@@ -26772,7 +28836,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -26811,7 +28875,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_AVX2",
@@ -26835,7 +28899,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_AVX2",
@@ -26859,7 +28923,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_SSSE3",
@@ -26883,7 +28947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -26907,7 +28971,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_SSSE3",
@@ -26931,7 +28995,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_AVX2",
@@ -26955,7 +29019,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_AVX2",
@@ -26979,7 +29043,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_SSSE3",
@@ -27003,7 +29067,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -27027,7 +29091,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_SSSE3",
@@ -27051,7 +29115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -27078,7 +29142,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_SSSE3",
@@ -27096,7 +29160,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -27114,7 +29178,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_SSSE3",
@@ -27132,7 +29196,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -27171,7 +29235,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -27198,7 +29262,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -27237,7 +29301,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -27270,7 +29334,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -27297,7 +29361,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_SSSE3",
@@ -27315,7 +29379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -27333,7 +29397,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_SSSE3",
@@ -27351,7 +29415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -27378,7 +29442,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_SSSE3",
@@ -27396,7 +29460,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -27414,7 +29478,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_SSSE3",
@@ -27432,7 +29496,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -27456,7 +29520,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -27480,7 +29544,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_AVX2",
@@ -27498,7 +29562,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_AVX2",
@@ -27516,7 +29580,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_SSSE3",
@@ -27534,7 +29598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -27552,7 +29616,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_SSSE3",
@@ -27570,7 +29634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -27588,7 +29652,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -27615,7 +29679,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_SSSE3",
@@ -27633,7 +29697,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -27651,7 +29715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_SSSE3",
@@ -27669,7 +29733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -27696,7 +29760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_SSSE3",
@@ -27714,7 +29778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -27732,7 +29796,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_SSSE3",
@@ -27750,7 +29814,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -27789,7 +29853,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -27816,7 +29880,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -27855,7 +29919,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -27879,7 +29943,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -27903,7 +29967,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_AVX2",
@@ -27921,7 +29985,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_AVX2",
@@ -27939,7 +30003,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_SSSE3",
@@ -27957,7 +30021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -27975,7 +30039,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_SSSE3",
@@ -27993,7 +30057,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -28011,7 +30075,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -28038,7 +30102,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_SSE2",
@@ -28056,7 +30120,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -28074,7 +30138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_SSE2",
@@ -28092,7 +30156,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -28131,7 +30195,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -28155,7 +30219,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -28173,7 +30237,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -28200,7 +30264,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -28239,7 +30303,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -28266,7 +30330,31 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_SSSE3",
@@ -28290,7 +30378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -28314,7 +30402,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_SSSE3",
@@ -28338,7 +30426,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_AVX2",
@@ -28356,7 +30444,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_AVX2",
@@ -28374,7 +30462,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_SSSE3",
@@ -28392,7 +30480,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -28410,7 +30498,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_SSSE3",
@@ -28428,7 +30516,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_SSSE3",
@@ -28446,7 +30534,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -28464,7 +30552,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_SSSE3",
@@ -28482,7 +30570,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -28512,7 +30600,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -28542,7 +30630,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -28560,7 +30648,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_X86",
@@ -28578,7 +30666,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -28614,7 +30702,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -28644,7 +30744,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -28671,7 +30771,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -28698,7 +30798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -28725,7 +30825,37 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "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"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -28785,7 +30915,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -28809,7 +30939,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -28833,7 +30963,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_SSE2",
@@ -28857,7 +30987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -28881,7 +31011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_SSE2",
@@ -28905,7 +31035,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -28929,7 +31059,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -28953,7 +31083,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_SSSE3",
@@ -28977,7 +31107,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_SSE2",
@@ -28998,7 +31128,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -29019,7 +31149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_SSE2",
@@ -29040,7 +31170,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_SSE2",
@@ -29061,7 +31191,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -29082,7 +31212,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_SSE2",
@@ -29103,7 +31233,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_SSE2",
@@ -29124,7 +31254,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -29145,7 +31275,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_SSE2",
@@ -29166,7 +31296,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_SSE2",
@@ -29190,7 +31320,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -29214,7 +31344,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_SSE2",
@@ -29238,7 +31368,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_SSE2",
@@ -29262,7 +31392,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -29286,7 +31416,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_SSE2",
@@ -29310,7 +31440,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -29328,7 +31458,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_AVX2",
@@ -29346,7 +31476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_AVX2",
@@ -29364,7 +31494,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_SSE2",
@@ -29382,7 +31512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -29400,7 +31530,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_SSE2",
@@ -29418,7 +31548,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -29442,7 +31572,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -29466,7 +31596,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_SSE2",
@@ -29490,7 +31620,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -29514,7 +31644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -29538,7 +31668,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -29562,7 +31692,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -29586,7 +31716,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -29610,7 +31740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -29634,7 +31764,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_SSSE3",
@@ -29658,7 +31788,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -29682,7 +31812,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -29703,7 +31833,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -29739,7 +31869,46 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -29784,7 +31953,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -29829,7 +31998,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -29877,7 +32046,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -29913,7 +32082,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -29949,7 +32118,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -29970,7 +32187,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_AVX2",
@@ -29991,7 +32208,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_AVX2",
@@ -30012,7 +32229,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_SSSE3",
@@ -30033,7 +32250,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -30054,7 +32271,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_AVX2",
@@ -30075,7 +32292,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -30096,7 +32313,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_SSSE3",
@@ -30117,7 +32334,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_SSSE3",
@@ -30138,7 +32355,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -30159,7 +32424,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_AVX2",
@@ -30180,7 +32445,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_AVX2",
@@ -30201,7 +32466,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_SSSE3",
@@ -30222,7 +32487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -30243,7 +32508,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_SSSE3",
@@ -30264,7 +32529,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -30285,7 +32598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_AVX2",
@@ -30306,7 +32619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_AVX2",
@@ -30327,7 +32640,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_SSSE3",
@@ -30348,7 +32661,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -30369,7 +32682,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_SSSE3",
@@ -30390,7 +32703,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -30411,7 +32724,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_SSSE3",
@@ -30432,7 +32745,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -30453,7 +32766,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_SSSE3",
@@ -30474,7 +32787,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -30495,7 +32808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -30516,7 +32829,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_SSSE3",
@@ -30537,7 +32850,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -30558,7 +32871,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_SSSE3",
@@ -30579,7 +32892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_SSSE3",
@@ -30600,7 +32913,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -30621,7 +32934,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_SSSE3",
@@ -30642,7 +32955,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -30663,7 +32976,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -30684,7 +32997,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_SSSE3",
@@ -30705,7 +33018,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -30726,7 +33039,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_SSSE3",
@@ -30747,7 +33060,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -30768,7 +33081,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_SSSE3",
@@ -30789,7 +33102,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -30810,7 +33123,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_SSSE3",
@@ -30831,7 +33144,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_SSSE3",
@@ -30852,7 +33165,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -30873,7 +33186,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_SSSE3",
@@ -30894,7 +33207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -30915,7 +33228,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_AVX2",
@@ -30936,7 +33249,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_AVX2",
@@ -30957,7 +33270,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_SSSE3",
@@ -30978,7 +33291,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -30999,7 +33312,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_SSSE3",
@@ -31020,7 +33333,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -31041,7 +33354,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_AVX2",
@@ -31062,7 +33375,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_AVX2",
@@ -31083,7 +33396,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_SSSE3",
@@ -31104,7 +33417,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -31125,7 +33438,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_SSSE3",
@@ -31146,7 +33459,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_AVX2",
@@ -31170,7 +33483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_AVX2",
@@ -31194,7 +33507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_SSSE3",
@@ -31218,7 +33531,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_SSSE3",
@@ -31242,7 +33555,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_AVX2",
@@ -31266,7 +33579,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_AVX2",
@@ -31290,7 +33603,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -31314,7 +33627,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_SSE2",
@@ -31338,7 +33651,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -31362,7 +33675,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_SSE2",
@@ -31386,7 +33699,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_AVX2",
@@ -31410,7 +33723,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_AVX2",
@@ -31434,7 +33747,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -31458,7 +33771,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSE2",
@@ -31482,7 +33795,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSSE3",
@@ -31506,7 +33819,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -31530,7 +33843,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSE2",
@@ -31554,7 +33867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSSE3",
@@ -31578,7 +33891,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_AVX2",
@@ -31596,7 +33909,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_AVX2",
@@ -31614,7 +33927,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_SSSE3",
@@ -31632,7 +33945,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_SSSE3",
@@ -31650,7 +33963,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_AVX2",
@@ -31668,7 +33981,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_AVX2",
@@ -31686,7 +33999,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -31704,7 +34017,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_SSE2",
@@ -31722,7 +34035,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -31740,7 +34053,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_SSE2",
@@ -31758,7 +34071,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_AVX2",
@@ -31776,7 +34089,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_AVX2",
@@ -31794,7 +34107,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -31812,7 +34125,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSE2",
@@ -31830,7 +34143,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSSE3",
@@ -31848,7 +34161,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -31866,7 +34179,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSE2",
@@ -31884,7 +34197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSSE3",
@@ -31902,7 +34215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -31923,7 +34236,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -31959,7 +34272,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -31980,7 +34293,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -32004,7 +34317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -32028,7 +34341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -32052,7 +34365,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -32076,7 +34389,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -32100,7 +34413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_AVX2",
@@ -32121,7 +34434,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_AVX2",
@@ -32142,7 +34455,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_SSSE3",
@@ -32163,7 +34476,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -32184,7 +34497,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_SSSE3",
@@ -32205,7 +34518,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -32226,7 +34539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -32247,7 +34560,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -32271,7 +34584,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -32295,7 +34608,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_AVX2",
@@ -32319,7 +34632,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_AVX2",
@@ -32343,7 +34656,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -32367,7 +34680,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_SSE41",
@@ -32391,7 +34704,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -32415,7 +34728,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_SSE41",
@@ -32439,7 +34752,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_AVX2",
@@ -32463,7 +34776,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_AVX2",
@@ -32487,7 +34800,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -32511,7 +34824,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_SSSE3",
@@ -32535,7 +34848,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -32559,7 +34872,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_SSSE3",
@@ -32583,7 +34896,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_AVX2",
@@ -32601,7 +34914,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_AVX2",
@@ -32619,7 +34932,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -32637,7 +34950,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_SSE41",
@@ -32655,7 +34968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -32673,7 +34986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_SSE41",
@@ -32691,7 +35004,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_AVX2",
@@ -32709,7 +35022,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_AVX2",
@@ -32727,7 +35040,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -32745,7 +35058,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_SSSE3",
@@ -32763,7 +35076,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -32781,7 +35094,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_SSSE3",
@@ -32799,7 +35112,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -32823,7 +35136,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_X86",
@@ -32841,7 +35154,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -32859,7 +35172,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_ERMS",
@@ -32877,7 +35190,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_X86",
@@ -32895,7 +35208,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_SSE2",
@@ -32916,7 +35229,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -32937,7 +35250,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_SSE2",
@@ -32958,7 +35271,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_SSE2",
@@ -32979,7 +35292,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -33000,7 +35313,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_SSE2",
@@ -33021,7 +35334,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -33045,7 +35358,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_SSE2",
@@ -33069,7 +35382,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_SSE2",
@@ -33090,7 +35403,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -33111,7 +35424,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_SSE2",
@@ -33132,7 +35445,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -33153,7 +35466,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_SSE2",
@@ -33174,7 +35487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -33219,7 +35532,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_AVX2",
@@ -33246,7 +35559,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_AVX2",
@@ -33273,7 +35586,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSE2",
@@ -33300,7 +35613,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSSE3",
@@ -33327,7 +35640,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -33354,7 +35667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSE2",
@@ -33381,7 +35694,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSSE3",
@@ -33408,7 +35721,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -33447,7 +35760,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_SSSE3",
@@ -33471,7 +35784,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -33495,7 +35808,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_SSSE3",
@@ -33519,7 +35832,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -33555,7 +35868,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -33588,7 +35901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -33621,7 +35934,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -33654,7 +35967,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -33687,7 +36000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -33720,7 +36033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -33756,7 +36069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_AVX2",
@@ -33780,7 +36093,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_AVX2",
@@ -33804,7 +36117,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -33828,7 +36141,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_AVX2",
@@ -33849,7 +36162,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_AVX2",
@@ -33870,7 +36183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_SSE2",
@@ -33891,7 +36204,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -33912,7 +36225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_SSE2",
@@ -33933,7 +36246,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_AVX2",
@@ -33957,7 +36270,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_AVX2",
@@ -33981,7 +36294,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSE2",
@@ -34005,7 +36318,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSSE3",
@@ -34029,7 +36342,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -34053,7 +36366,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSE2",
@@ -34077,7 +36390,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSSE3",
@@ -34101,7 +36414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -34116,7 +36429,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -34134,7 +36447,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_SSE2",
@@ -34152,7 +36465,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -34179,7 +36492,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_AVX2",
@@ -34197,7 +36510,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_AVX2",
@@ -34215,7 +36528,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_SSSE3",
@@ -34233,7 +36546,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -34251,7 +36564,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_SSSE3",
@@ -34269,7 +36582,79 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::Transpose4x4_32_AVX2",
+   "linker_set_key" : "Transpose4x4_32_AVX2",
+   "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_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_SSE2",
+   "linker_set_key" : "Transpose4x4_32_SSE2",
+   "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::TransposePlane",
@@ -34296,7 +36681,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_Any_SSE2",
@@ -34326,7 +36711,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -34356,7 +36741,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_SSE2",
@@ -34386,7 +36771,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -34419,7 +36804,31 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_SSSE3",
@@ -34443,7 +36852,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -34467,7 +36876,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Fast_Any_SSSE3",
@@ -34491,7 +36900,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Fast_SSSE3",
@@ -34515,7 +36924,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_SSSE3",
@@ -34539,7 +36948,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -34566,7 +37002,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -34605,7 +37041,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -34644,7 +37080,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -34683,7 +37119,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -34722,7 +37158,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -34761,7 +37197,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -34800,7 +37236,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -34839,7 +37275,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -34878,7 +37314,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -34917,7 +37353,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -34956,7 +37392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -34995,7 +37431,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -35034,7 +37470,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -35073,7 +37509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -35112,7 +37548,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -35139,7 +37575,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_AVX2",
@@ -35160,7 +37596,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_AVX2",
@@ -35181,7 +37617,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_SSSE3",
@@ -35202,7 +37638,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -35223,7 +37659,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_SSSE3",
@@ -35244,7 +37680,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -35283,7 +37719,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -35322,7 +37758,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -35355,7 +37791,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_AVX2",
@@ -35376,7 +37812,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_AVX2",
@@ -35397,7 +37833,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_SSE2",
@@ -35418,7 +37854,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -35439,7 +37875,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_SSE2",
@@ -35460,7 +37896,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_AVX2",
@@ -35484,7 +37920,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_AVX2",
@@ -35508,7 +37944,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_SSE2",
@@ -35532,7 +37968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -35556,7 +37992,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_SSE2",
@@ -35580,7 +38016,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -35607,7 +38043,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_AVX2",
@@ -35625,7 +38061,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_AVX2",
@@ -35643,7 +38079,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_SSE2",
@@ -35661,7 +38097,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -35679,7 +38115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_SSE2",
@@ -35697,7 +38133,25 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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::ValidateJpeg",
@@ -35712,7 +38166,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -35739,7 +38193,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_AVX2",
@@ -35760,7 +38214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_AVX2",
@@ -35781,7 +38235,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_SSSE3",
@@ -35802,7 +38256,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -35823,7 +38277,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_SSSE3",
@@ -35844,7 +38298,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -35883,7 +38337,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -35922,7 +38376,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -35955,7 +38409,112 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+  },
+  {
+   "function_name" : "libyuv::YUY2ToNVUVRow_AVX2",
+   "linker_set_key" : "YUY2ToNVUVRow_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "YUY2ToNVUVRow_Any_AVX2",
+   "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_Any_SSE2",
+   "linker_set_key" : "YUY2ToNVUVRow_Any_SSE2",
+   "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_SSE2",
+   "linker_set_key" : "YUY2ToNVUVRow_SSE2",
+   "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::YUY2ToUV422Row_AVX2",
@@ -35976,7 +38535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_AVX2",
@@ -35997,7 +38556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_SSE2",
@@ -36018,7 +38577,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -36039,7 +38598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_SSE2",
@@ -36060,7 +38619,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_AVX2",
@@ -36084,7 +38643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_AVX2",
@@ -36108,7 +38667,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_SSE2",
@@ -36132,7 +38691,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -36156,7 +38715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_SSE2",
@@ -36180,7 +38739,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -36207,7 +38766,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_AVX2",
@@ -36225,7 +38784,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_AVX2",
@@ -36243,7 +38802,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_SSE2",
@@ -36261,7 +38820,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -36279,7 +38838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_SSE2",
@@ -36297,7 +38856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -36311,7 +38870,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -36324,7 +38883,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -36338,7 +38897,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -36351,7 +38910,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -36373,7 +38932,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -36398,7 +38957,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -36414,7 +38973,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -36427,7 +38986,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -36443,7 +39002,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -36459,7 +39018,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -36476,7 +39035,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -36492,7 +39051,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -36508,7 +39067,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -36524,7 +39083,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -36541,7 +39100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -36555,7 +39114,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -36571,7 +39130,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -36587,7 +39146,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -36605,7 +39164,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -36618,7 +39177,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -36634,7 +39193,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -36647,7 +39206,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -36660,7 +39219,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -36679,7 +39238,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -36692,7 +39251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -36705,7 +39264,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -36718,7 +39277,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -36731,7 +39290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -36740,121 +39299,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -36867,7 +39426,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -36876,7 +39435,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -36885,7 +39444,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -36894,7 +39453,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -36903,7 +39462,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 8,
@@ -36912,7 +39471,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -36921,7 +39480,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -36930,7 +39489,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 8,
@@ -36939,7 +39498,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -36948,7 +39507,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 8,
@@ -36957,7 +39516,16 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "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"
   },
   {
    "alignment" : 8,
@@ -36966,7 +39534,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -36975,7 +39543,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -36984,7 +39552,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -36993,7 +39561,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -37002,7 +39570,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -37011,7 +39579,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -37020,7 +39588,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 8,
@@ -37029,7 +39597,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -37038,7 +39606,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -37047,7 +39615,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 8,
@@ -37056,7 +39624,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 8,
@@ -37065,7 +39633,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -37078,7 +39646,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 2,
@@ -37088,7 +39656,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 8,
@@ -37098,7 +39666,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -37108,7 +39676,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -37118,7 +39686,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -37128,7 +39696,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -37138,7 +39706,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -37148,7 +39716,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -37158,7 +39726,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -37168,7 +39736,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -37197,7 +39765,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 16,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 8,
@@ -37275,7 +39843,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 96,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -37311,7 +39879,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 8,
@@ -37332,7 +39900,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 16,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "rvalue_reference_types" : []
diff --git a/34/64/x86_x86_64/source-based/android.hardware.audio.common@2.0.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.audio.common@2.0.so.lsdump
index 2f66bb2..64469f7 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.audio.common@2.0.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.audio.common@2.0.so.lsdump
@@ -2667,7 +2667,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"
     },
     {
@@ -2807,119 +2807,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -2936,7 +2936,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3084,7 +3084,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -3665,7 +3665,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -3889,39 +3889,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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/x86_x86_64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
index a175cf4..4296c99 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.graphics.allocator-V2-ndk.so.lsdump
@@ -635,7 +635,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -643,7 +643,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_x86_64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
index c2e730a..ec8f536 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.graphics.bufferqueue@1.0.so.lsdump
@@ -3690,11 +3690,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_x86_64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
index a0f53a8..dba6120 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.graphics.bufferqueue@2.0.so.lsdump
@@ -3684,11 +3684,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -4275,11 +4275,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4860,11 +4860,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_x86_64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
index a7ed66a..06ddcd0 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.graphics.common-V4-ndk.so.lsdump
@@ -562,7 +562,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -570,7 +570,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.0.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.0.so.lsdump
index 9a047be..4f69495 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.0.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.0.so.lsdump
@@ -2856,11 +2856,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.1.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.1.so.lsdump
index ebc16fb..7a827ca 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.1.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.1.so.lsdump
@@ -2856,11 +2856,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3447,11 +3447,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.2.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.2.so.lsdump
index 441ecba..7a13db9 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.2.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.graphics.common@1.2.so.lsdump
@@ -2873,11 +2873,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3464,11 +3464,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4049,11 +4049,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
index d847e0f..274d783 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@2.0.so.lsdump
@@ -3230,11 +3230,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
index 96f7e6d..c0a2f08 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@2.1.so.lsdump
@@ -3228,11 +3228,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3819,11 +3819,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
index 508d1c8..e8146f3 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@3.0.so.lsdump
@@ -3266,11 +3266,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3857,11 +3857,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4442,11 +4442,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
index 04cfa8b..1f47e56 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.graphics.mapper@4.0.so.lsdump
@@ -3362,11 +3362,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3953,11 +3953,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4538,11 +4538,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_x86_64/source-based/android.hardware.media.omx@1.0.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.media.omx@1.0.so.lsdump
index cc3453e..03b9919 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.media.omx@1.0.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.media.omx@1.0.so.lsdump
@@ -5060,11 +5060,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_x86_64/source-based/android.hardware.media@1.0.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.media@1.0.so.lsdump
index 2e11995..dd8eb56 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.media@1.0.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.media@1.0.so.lsdump
@@ -2864,11 +2864,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
diff --git a/34/64/x86_x86_64/source-based/android.hardware.soundtrigger@2.0.so.lsdump b/34/64/x86_x86_64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
index da8c2d2..328ef87 100644
--- a/34/64/x86_x86_64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hardware.soundtrigger@2.0.so.lsdump
@@ -3418,7 +3418,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"
     },
     {
@@ -3558,119 +3558,119 @@
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_DEFAULT"
     },
     {
-     "enum_field_value" : -1021313025,
+     "enum_field_value" : 3273654271,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "android::hardware::audio::common::V2_0::AudioDevice::IN_ALL_USB"
     }
    ],
@@ -3687,7 +3687,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::INVALID"
     },
     {
@@ -3835,7 +3835,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::LDAC"
     },
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "android::hardware::audio::common::V2_0::AudioFormat::MAIN_MASK"
     },
     {
@@ -4416,7 +4416,7 @@
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::NONE"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INVALID"
     },
     {
@@ -4640,39 +4640,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" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "android::hardware::audio::common::V2_0::AudioChannelMask::INDEX_MASK_8"
     }
    ],
diff --git a/34/64/x86_x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump b/34/64/x86_x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
index 552de38..e166f98 100644
--- a/34/64/x86_x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hidl.memory@1.0-impl.so.lsdump
@@ -963,6 +963,31 @@
    "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_x86_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -17903,7 +17928,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -17912,7 +17937,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -17927,7 +17952,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -17936,7 +17961,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -17951,7 +17976,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -17960,7 +17985,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -17975,7 +18000,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -17984,7 +18009,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -38187,7 +38212,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -42751,7 +42776,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -42791,7 +42816,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -42801,7 +42826,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -42811,7 +42836,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -43607,7 +43632,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -43616,7 +43641,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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/x86_x86_64/source-based/android.hidl.token@1.0-utils.so.lsdump b/34/64/x86_x86_64/source-based/android.hidl.token@1.0-utils.so.lsdump
index 6a8925a..527ce30 100644
--- a/34/64/x86_x86_64/source-based/android.hidl.token@1.0-utils.so.lsdump
+++ b/34/64/x86_x86_64/source-based/android.hidl.token@1.0-utils.so.lsdump
@@ -5945,6 +5945,12 @@
     },
     {
      "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/x86_x86_64/source-based/config.json b/34/64/x86_x86_64/source-based/config.json
index 403b4cf..5da2c2b 100644
--- a/34/64/x86_x86_64/source-based/config.json
+++ b/34/64/x86_x86_64/source-based/config.json
@@ -1,4 +1,9 @@
 {
+  "global": {
+    "flags": {
+      "advice_only": true
+    }
+  },
   "libbinder": [
     {
       "target_version": "current",
diff --git a/34/64/x86_x86_64/source-based/libRSCpuRef.so.lsdump b/34/64/x86_x86_64/source-based/libRSCpuRef.so.lsdump
index 9e0936b..6e17ec1 100644
--- a/34/64/x86_x86_64/source-based/libRSCpuRef.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libRSCpuRef.so.lsdump
@@ -169,7 +169,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -313,7 +313,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -655,7 +655,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -673,7 +673,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -691,7 +691,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7058,7 +7058,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -7074,11 +7074,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -7087,7 +7087,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -7340,6 +7340,31 @@
    "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_x86_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -10971,7 +10996,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10989,7 +11014,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11022,7 +11047,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11037,7 +11062,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11055,7 +11080,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11073,7 +11098,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11100,7 +11125,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11136,7 +11161,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11154,7 +11179,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11175,7 +11200,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11199,7 +11224,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11235,7 +11260,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11274,7 +11299,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11310,7 +11335,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11349,7 +11374,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11382,7 +11407,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11400,7 +11425,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11517,7 +11542,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11538,7 +11563,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -23640,7 +23665,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23649,7 +23674,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23703,7 +23728,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23721,7 +23746,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23829,7 +23854,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23838,7 +23863,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24189,7 +24214,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24198,7 +24223,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24207,7 +24232,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24216,7 +24241,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24225,7 +24250,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24234,7 +24259,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24243,7 +24268,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24261,7 +24286,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24270,7 +24295,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24279,7 +24304,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24288,7 +24313,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24297,7 +24322,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24306,7 +24331,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24315,7 +24340,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24324,7 +24349,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24333,7 +24358,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24342,7 +24367,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24405,7 +24430,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -24414,7 +24439,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -24972,7 +24997,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25017,7 +25042,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -25026,7 +25051,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25176,8 +25201,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_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript12ScriptGroup2E#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -25626,8 +25651,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_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/cpu_ref/rsCpuScriptGroup2.h"
   },
@@ -31623,7 +31648,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -31677,7 +31702,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -32393,7 +32418,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -32443,7 +32468,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -32453,7 +32478,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -36096,7 +36121,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_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+   "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
    "self_type" : "_ZTIKPKN7android12renderscript7ClosureE",
    "size" : 4,
    "source_file" : "frameworks/rs/rsMap.h"
@@ -37593,7 +37618,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -37649,7 +37674,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 8,
@@ -38500,7 +38525,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -38836,7 +38861,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -39376,7 +39401,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -39589,7 +39614,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -47950,7 +47975,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48031,7 +48056,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -48806,7 +48831,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -48823,7 +48848,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIPKNS0_13ScriptFieldIDENS0_13ObjectBaseRefIS2_EEEE"
    ]
   },
@@ -48833,7 +48858,7 @@
    [
     {
      "field_name" : "first",
-     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump"
     },
     {
      "field_name" : "second",
@@ -48850,7 +48875,7 @@
    "source_file" : "frameworks/rs/rsMap.h",
    "template_args" :
    [
-    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
+    "_ZTIPKN7android12renderscript7ClosureE#ODR:out/soong/.intermediates/frameworks/rs/cpu_ref/libRSCpuRef/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/cpu_ref/rsCpuScriptGroup2.sdump",
     "_ZTIPN7android12renderscript3MapIiNS0_13ObjectBaseRefINS0_13ScriptFieldIDEEEEE"
    ]
   },
@@ -57969,7 +57994,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -57978,7 +58003,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -57993,7 +58018,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -58002,7 +58027,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -58017,7 +58042,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -58026,7 +58051,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -58041,7 +58066,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -58050,7 +58075,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -129457,7 +129482,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -129466,7 +129491,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -129484,7 +129509,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
-   "name" : "std::__make_tuple_indices<2, 0>",
+   "name" : "std::__make_tuple_indices<2>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj2ELj0EEE",
    "size" : 1,
@@ -151111,7 +151136,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -151151,7 +151176,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -151161,7 +151186,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -151171,7 +151196,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -151274,7 +151299,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<path &&, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJONS_4__fs10filesystem4pathES4_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151388,7 +151413,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, path &&>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathEOS3_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151502,7 +151527,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
-   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false, false>",
+   "name" : "std::tuple<const path &, const path &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRKNS_4__fs10filesystem4pathES5_EE26_CheckTupleLikeConstructorILb0ELb0EvEE",
    "size" : 1,
@@ -151601,7 +151626,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
-   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false, true>",
+   "name" : "std::tuple<allocator<_Storage> &>::_CheckTupleLikeConstructor<false>",
    "referenced_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "self_type" : "_ZTINSt3__15tupleIJRNS_9allocatorINS_4__fs10filesystem16filesystem_error8_StorageEEEEE26_CheckTupleLikeConstructorILb0ELb1EvEE",
    "size" : 1,
@@ -152420,7 +152445,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -152429,7 +152454,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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/x86_x86_64/source-based/libRSDriver.so.lsdump b/34/64/x86_x86_64/source-based/libRSDriver.so.lsdump
index b6354d6..beec053 100644
--- a/34/64/x86_x86_64/source-based/libRSDriver.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libRSDriver.so.lsdump
@@ -5970,7 +5970,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5986,71 +5986,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -6262,6 +6262,31 @@
    "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_x86_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -10604,7 +10629,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "referenced_type" : "_ZTIj"
@@ -10628,7 +10653,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIb",
@@ -11315,7 +11340,7 @@
      "referenced_type" : "_ZTIPKN7android12renderscript7ContextE"
     },
     {
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     }
    ],
    "return_type" : "_ZTIv",
@@ -26478,8 +26503,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_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -32424,7 +32449,7 @@
     {
      "access" : "protected",
      "field_name" : "mRSMesh",
-     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/driver/rsdMesh.sdump"
+     "referenced_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRSDriver/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/driver/rsdMesh.sdump"
     },
     {
      "access" : "protected",
@@ -69459,7 +69484,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
diff --git a/34/64/x86_x86_64/source-based/libRS_internal.so.lsdump b/34/64/x86_x86_64/source-based/libRS_internal.so.lsdump
index dff4ac3..b127a5d 100644
--- a/34/64/x86_x86_64/source-based/libRS_internal.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libRS_internal.so.lsdump
@@ -8302,7 +8302,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -8318,71 +8318,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -8574,6 +8574,31 @@
    "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_x86_x86_64_shared/gen/include/bits/bionic_multibyte_result.h",
+   "underlying_type" : "_ZTIj"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
      "enum_field_value" : 0,
      "name" : "REG_GS"
     },
@@ -31952,7 +31977,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_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
    "self_type" : "_ZTIRKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
@@ -37781,8 +37806,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_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump",
    "size" : 4,
    "source_file" : "external/libcxx/include/type_traits"
   },
@@ -38024,8 +38049,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_x86_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsApiFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38033,8 +38058,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_x86_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/rsContext.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsContext.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38042,8 +38067,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_x86_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/rsFileA3D.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsFileA3D.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -38051,8 +38076,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_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
-   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "referenced_type" : "_ZTIKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
+   "self_type" : "_ZTIPKN7android12renderscript4MeshE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptC_LibGL.sdump",
    "size" : 4,
    "source_file" : "frameworks/rs/rs_hal.h"
   },
@@ -74466,7 +74491,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -74475,7 +74500,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74490,7 +74515,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -74499,7 +74524,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74514,7 +74539,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -74523,7 +74548,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -74538,7 +74563,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -74547,7 +74572,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -126001,7 +126026,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -139489,7 +139514,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -139632,7 +139657,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -147186,7 +147211,7 @@
    "source_file" : "external/libcxx/include/type_traits",
    "template_args" :
    [
-    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/obj/frameworks/rs/rsScriptGroup.sdump"
+    "_ZTIKN7android12renderscript13ObjectBaseRefINS0_14ScriptKernelIDEEE#ODR:out/soong/.intermediates/frameworks/rs/libRS_internal/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/rs/rsScriptGroup.sdump"
    ]
   },
   {
@@ -156511,7 +156536,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -156551,7 +156576,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -156561,7 +156586,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -156571,7 +156596,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -157329,7 +157354,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -157338,7 +157363,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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/x86_x86_64/source-based/libaudioutils.so.lsdump b/34/64/x86_x86_64/source-based/libaudioutils.so.lsdump
index b6cb435..e4788ee 100644
--- a/34/64/x86_x86_64/source-based/libaudioutils.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libaudioutils.so.lsdump
@@ -1740,6 +1740,14 @@
   },
   {
    "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"
   },
   {
@@ -2927,7 +2935,7 @@
      "name" : "VX_AUDIO_FORMAT_LC3"
     },
     {
-     "enum_field_value" : -1,
+     "enum_field_value" : 4294967295,
      "name" : "AUDIO_FORMAT_INVALID"
     },
     {
@@ -3165,119 +3173,119 @@
      "name" : "AUDIO_DEVICE_OUT_DEFAULT"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_DEVICE_IN_COMMUNICATION"
     },
     {
-     "enum_field_value" : -2147483646,
+     "enum_field_value" : 2147483650,
      "name" : "AUDIO_DEVICE_IN_AMBIENT"
     },
     {
-     "enum_field_value" : -2147483644,
+     "enum_field_value" : 2147483652,
      "name" : "AUDIO_DEVICE_IN_BUILTIN_MIC"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET"
     },
     {
-     "enum_field_value" : -2147483632,
+     "enum_field_value" : 2147483664,
      "name" : "AUDIO_DEVICE_IN_WIRED_HEADSET"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_HDMI"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_TELEPHONY_RX"
     },
     {
-     "enum_field_value" : -2147483520,
+     "enum_field_value" : 2147483776,
      "name" : "AUDIO_DEVICE_IN_BACK_MIC"
     },
     {
-     "enum_field_value" : -2147483392,
+     "enum_field_value" : 2147483904,
      "name" : "AUDIO_DEVICE_IN_REMOTE_SUBMIX"
     },
     {
-     "enum_field_value" : -2147483136,
+     "enum_field_value" : 2147484160,
      "name" : "AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147482624,
+     "enum_field_value" : 2147484672,
      "name" : "AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET"
     },
     {
-     "enum_field_value" : -2147481600,
+     "enum_field_value" : 2147485696,
      "name" : "AUDIO_DEVICE_IN_USB_ACCESSORY"
     },
     {
-     "enum_field_value" : -2147479552,
+     "enum_field_value" : 2147487744,
      "name" : "AUDIO_DEVICE_IN_USB_DEVICE"
     },
     {
-     "enum_field_value" : -2147475456,
+     "enum_field_value" : 2147491840,
      "name" : "AUDIO_DEVICE_IN_FM_TUNER"
     },
     {
-     "enum_field_value" : -2147467264,
+     "enum_field_value" : 2147500032,
      "name" : "AUDIO_DEVICE_IN_TV_TUNER"
     },
     {
-     "enum_field_value" : -2147450880,
+     "enum_field_value" : 2147516416,
      "name" : "AUDIO_DEVICE_IN_LINE"
     },
     {
-     "enum_field_value" : -2147418112,
+     "enum_field_value" : 2147549184,
      "name" : "AUDIO_DEVICE_IN_SPDIF"
     },
     {
-     "enum_field_value" : -2147352576,
+     "enum_field_value" : 2147614720,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
     },
     {
-     "enum_field_value" : -2147221504,
+     "enum_field_value" : 2147745792,
      "name" : "AUDIO_DEVICE_IN_LOOPBACK"
     },
     {
-     "enum_field_value" : -2146959360,
+     "enum_field_value" : 2148007936,
      "name" : "AUDIO_DEVICE_IN_IP"
     },
     {
-     "enum_field_value" : -2146435072,
+     "enum_field_value" : 2148532224,
      "name" : "AUDIO_DEVICE_IN_BUS"
     },
     {
-     "enum_field_value" : -2130706432,
+     "enum_field_value" : 2164260864,
      "name" : "AUDIO_DEVICE_IN_PROXY"
     },
     {
-     "enum_field_value" : -2113929216,
+     "enum_field_value" : 2181038080,
      "name" : "AUDIO_DEVICE_IN_USB_HEADSET"
     },
     {
-     "enum_field_value" : -2080374784,
+     "enum_field_value" : 2214592512,
      "name" : "AUDIO_DEVICE_IN_BLUETOOTH_BLE"
     },
     {
-     "enum_field_value" : -2013265920,
+     "enum_field_value" : 2281701376,
      "name" : "AUDIO_DEVICE_IN_HDMI_ARC"
     },
     {
-     "enum_field_value" : -2013265919,
+     "enum_field_value" : 2281701377,
      "name" : "AUDIO_DEVICE_IN_HDMI_EARC"
     },
     {
-     "enum_field_value" : -1879048192,
+     "enum_field_value" : 2415919104,
      "name" : "AUDIO_DEVICE_IN_ECHO_REFERENCE"
     },
     {
-     "enum_field_value" : -1610612736,
+     "enum_field_value" : 2684354560,
      "name" : "AUDIO_DEVICE_IN_BLE_HEADSET"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_DEFAULT"
     },
     {
@@ -3289,15 +3297,15 @@
      "name" : "AUDIO_DEVICE_OUT_STUB"
     },
     {
-     "enum_field_value" : -2147483584,
+     "enum_field_value" : 2147483712,
      "name" : "AUDIO_DEVICE_IN_VOICE_CALL"
     },
     {
-     "enum_field_value" : -2147483616,
+     "enum_field_value" : 2147483680,
      "name" : "AUDIO_DEVICE_IN_AUX_DIGITAL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_DEVICE_IN_STUB"
     }
    ],
@@ -4100,15 +4108,15 @@
      "name" : "AUDIO_DEVICE_OUT_ALL_USB"
     },
     {
-     "enum_field_value" : -551550977,
+     "enum_field_value" : 3743416319,
      "name" : "AUDIO_DEVICE_IN_ALL"
     },
     {
-     "enum_field_value" : -2147483640,
+     "enum_field_value" : 2147483656,
      "name" : "AUDIO_DEVICE_IN_ALL_SCO"
     },
     {
-     "enum_field_value" : -2113923072,
+     "enum_field_value" : 2181044224,
      "name" : "AUDIO_DEVICE_IN_ALL_USB"
     },
     {
@@ -4590,99 +4598,99 @@
      "name" : "AUDIO_CHANNEL_IN_VOICE_CALL_MONO"
     },
     {
-     "enum_field_value" : -2147483647,
+     "enum_field_value" : 2147483649,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_1"
     },
     {
-     "enum_field_value" : -2147483645,
+     "enum_field_value" : 2147483651,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_2"
     },
     {
-     "enum_field_value" : -2147483641,
+     "enum_field_value" : 2147483655,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_3"
     },
     {
-     "enum_field_value" : -2147483633,
+     "enum_field_value" : 2147483663,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_4"
     },
     {
-     "enum_field_value" : -2147483617,
+     "enum_field_value" : 2147483679,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_5"
     },
     {
-     "enum_field_value" : -2147483585,
+     "enum_field_value" : 2147483711,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_6"
     },
     {
-     "enum_field_value" : -2147483521,
+     "enum_field_value" : 2147483775,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_7"
     },
     {
-     "enum_field_value" : -2147483393,
+     "enum_field_value" : 2147483903,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_8"
     },
     {
-     "enum_field_value" : -2147483137,
+     "enum_field_value" : 2147484159,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_9"
     },
     {
-     "enum_field_value" : -2147482625,
+     "enum_field_value" : 2147484671,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_10"
     },
     {
-     "enum_field_value" : -2147481601,
+     "enum_field_value" : 2147485695,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_11"
     },
     {
-     "enum_field_value" : -2147479553,
+     "enum_field_value" : 2147487743,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_12"
     },
     {
-     "enum_field_value" : -2147475457,
+     "enum_field_value" : 2147491839,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_13"
     },
     {
-     "enum_field_value" : -2147467265,
+     "enum_field_value" : 2147500031,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_14"
     },
     {
-     "enum_field_value" : -2147450881,
+     "enum_field_value" : 2147516415,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_15"
     },
     {
-     "enum_field_value" : -2147418113,
+     "enum_field_value" : 2147549183,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_16"
     },
     {
-     "enum_field_value" : -2147352577,
+     "enum_field_value" : 2147614719,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_17"
     },
     {
-     "enum_field_value" : -2147221505,
+     "enum_field_value" : 2147745791,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_18"
     },
     {
-     "enum_field_value" : -2146959361,
+     "enum_field_value" : 2148007935,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_19"
     },
     {
-     "enum_field_value" : -2146435073,
+     "enum_field_value" : 2148532223,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_20"
     },
     {
-     "enum_field_value" : -2145386497,
+     "enum_field_value" : 2149580799,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_21"
     },
     {
-     "enum_field_value" : -2143289345,
+     "enum_field_value" : 2151677951,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_22"
     },
     {
-     "enum_field_value" : -2139095041,
+     "enum_field_value" : 2155872255,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_23"
     },
     {
-     "enum_field_value" : -2130706433,
+     "enum_field_value" : 2164260863,
      "name" : "AUDIO_CHANNEL_INDEX_MASK_24"
     },
     {
@@ -4698,7 +4706,7 @@
      "name" : "AUDIO_CHANNEL_IN_ALL"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "AUDIO_CHANNEL_INVALID"
     }
    ],
@@ -5420,7 +5428,7 @@
      "name" : "AUDIO_CHANNEL_COUNT_MAX"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_CHANNEL_INDEX_HDR"
     }
    ],
@@ -5495,7 +5503,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AUDIO_DEVICE_BIT_IN"
     },
     {
@@ -5516,7 +5524,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -16777216,
+     "enum_field_value" : 4278190080,
      "name" : "AUDIO_FORMAT_MAIN_MASK"
     },
     {
@@ -12212,7 +12220,7 @@
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android11audio_utils12BiquadFilterIfLb1ENS0_7details25DefaultBiquadConstOptionsEE12mFilterFuncsE",
-   "name" : "android::audio_utils::BiquadFilter<float, true>::mFilterFuncs",
+   "name" : "android::audio_utils::BiquadFilter<>::mFilterFuncs",
    "referenced_type" : "_ZTIKNSt3__15arrayIPFvPfPKfjjjS1_S3_jN7android11audio_utils7details13FILTER_OPTIONEELj32EEE",
    "source_file" : "system/media/audio_utils/include/audio_utils/BiquadFilter.h"
   },
@@ -13977,7 +13985,7 @@
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false> *",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float> *",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIPN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 4,
@@ -19127,7 +19135,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
-   "name" : "android::audio_utils::BiquadStateSpace<float, float, false>",
+   "name" : "android::audio_utils::BiquadStateSpace<float, float>",
    "referenced_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "self_type" : "_ZTIN7android11audio_utils16BiquadStateSpaceIffLb0EEE",
    "size" : 28,
diff --git a/34/64/x86_x86_64/source-based/libbase.so.lsdump b/34/64/x86_x86_64/source-based/libbase.so.lsdump
index 2029f6b..d6f7d7c 100644
--- a/34/64/x86_x86_64/source-based/libbase.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libbase.so.lsdump
@@ -1074,12 +1074,21 @@
    "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"
   },
   {
@@ -1916,7 +1925,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1967,7 +1976,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -2723,7 +2732,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<char, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<char>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIcLj500ENSt3__19allocatorIcEEE4growEj",
    "parameters" :
    [
@@ -2757,7 +2766,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "fmt::basic_memory_buffer<wchar_t, 500>::grow",
+   "function_name" : "fmt::basic_memory_buffer<wchar_t>::grow",
    "linker_set_key" : "_ZN3fmt2v719basic_memory_bufferIwLj500ENSt3__19allocatorIwEEE4growEj",
    "parameters" :
    [
@@ -4906,6 +4915,23 @@
    "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" :
@@ -4924,6 +4950,22 @@
   },
   {
    "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" :
    [
@@ -4940,6 +4982,22 @@
   },
   {
    "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/x86_x86_64/source-based/libbinder.so.lsdump b/34/64/x86_x86_64/source-based/libbinder.so.lsdump
index 0a3a917..ea65ecd 100644
--- a/34/64/x86_x86_64/source-based/libbinder.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libbinder.so.lsdump
@@ -73,6 +73,15 @@
    "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" : 4,
    "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]",
@@ -91,15 +100,6 @@
    "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" : 4,
    "linker_set_key" : "_ZTIA20_y",
    "name" : "unsigned long long[20]",
@@ -1064,34 +1064,6 @@
    "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"
   },
   {
@@ -1863,214 +1835,6 @@
    "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"
   },
   {
@@ -2155,12 +1919,21 @@
    "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"
   },
   {
@@ -2326,22 +2099,6 @@
    "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_"
   },
   {
@@ -2357,22 +2114,6 @@
    "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"
   },
   {
@@ -2424,14 +2165,6 @@
    "name" : "_ZN7android6Parcel12restartWriteEj"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android6Parcel12writeAlignedIxEEiT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android6Parcel12writeAlignedIyEEiT_"
-  },
-  {
    "name" : "_ZN7android6Parcel12writeCStringEPKc"
   },
   {
@@ -2570,6 +2303,9 @@
    "name" : "_ZN7android6Parcel16writeUtf8AsUtf16ERKNSt3__18optionalINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEEE"
   },
   {
+   "name" : "_ZN7android6Parcel17setServiceFuzzingEv"
+  },
+  {
    "name" : "_ZN7android6Parcel17writeDoubleVectorERKNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -2777,6 +2513,9 @@
    "name" : "_ZN7android6binder20LazyServiceRegistrar15registerServiceERKNS_2spINS_7IBinderEEERKNSt3__112basic_stringIcNS7_11char_traitsIcEENS7_9allocatorIcEEEEbi"
   },
   {
+   "name" : "_ZN7android6binder20LazyServiceRegistrar23createExtraTestInstanceEv"
+  },
+  {
    "name" : "_ZN7android6binder20LazyServiceRegistrar25setActiveServicesCallbackERKNSt3__18functionIFbbEEE"
   },
   {
@@ -3314,6 +3053,9 @@
    "name" : "_ZN7android8RpcState23processTransactInternalERKNS_2spINS_10RpcSession13RpcConnectionEEERKNS1_IS2_EENS0_11CommandDataEONSt3__16vectorINSB_7variantIJNS_4base14unique_fd_implINSE_13DefaultCloserEEENSE_11borrowed_fdEEEENSB_9allocatorISJ_EEEE"
   },
   {
+   "name" : "_ZN7android8RpcState23validateProtocolVersionEj"
+  },
+  {
    "name" : "_ZN7android8RpcState4dumpEv"
   },
   {
@@ -3524,7 +3266,10 @@
    "name" : "_ZN7android9RpcServer23recvmsgSocketConnectionERKS0_PNS_14RpcTransportFdE"
   },
   {
-   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE"
+   "name" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE"
+  },
+  {
+   "name" : "_ZN7android9RpcServer23setServerSocketModifierEONSt3__18functionIFvNS_4base11borrowed_fdEEEE"
   },
   {
    "name" : "_ZN7android9RpcServer24numUninitializedSessionsEv"
@@ -3842,22 +3587,6 @@
    "name" : "_ZNK7android6Parcel11ipcDataSizeEv"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIdEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIiEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIxEEiPT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNK7android6Parcel11readAlignedIyEEiPT_"
-  },
-  {
    "name" : "_ZNK7android6Parcel11readCStringEv"
   },
   {
@@ -3987,6 +3716,9 @@
    "name" : "_ZNK7android6Parcel16enforceInterfaceERKNS_8String16EPNS_14IPCThreadStateE"
   },
   {
+   "name" : "_ZNK7android6Parcel16isServiceFuzzingEv"
+  },
+  {
    "name" : "_ZNK7android6Parcel16readDoubleVectorEPNSt3__110unique_ptrINS1_6vectorIdNS1_9allocatorIdEEEENS1_14default_deleteIS6_EEEE"
   },
   {
@@ -4005,14 +3737,6 @@
    "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"
   },
   {
@@ -4196,198 +3920,6 @@
    "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"
   },
   {
@@ -4494,406 +4026,10 @@
   },
   {
    "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_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_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_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_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_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_EEEC2EjjSA_"
-  },
-  {
-   "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_bufferIxRNS_9allocatorIxEEED2Ev"
-  },
-  {
-   "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_"
   },
   {
@@ -4902,1329 +4038,9 @@
   },
   {
    "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"
   },
   {
@@ -6486,15 +4302,9 @@
    "name" : "_ZN7android15IResultReceiver12default_implE"
   },
   {
-   "name" : "_ZN7android16kEnableRecordingE"
-  },
-  {
    "name" : "_ZN7android18the_context_objectE"
   },
   {
-   "name" : "_ZN7android20kEnableRpcDevServersE"
-  },
-  {
    "name" : "_ZN7android22SimpleBestFitAllocator12kMemoryAlignE"
   },
   {
@@ -6931,10 +4741,6 @@
    "name" : "_ZTTN7android10MemoryBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android10PoolThreadE"
-  },
-  {
    "name" : "_ZTTN7android10RpcSession23WaitForShutdownListenerE"
   },
   {
@@ -6962,10 +4768,6 @@
    "name" : "_ZTTN7android15BnShellCallbackE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android15BpShellCallbackE"
-  },
-  {
    "name" : "_ZTTN7android15IResultReceiverE"
   },
   {
@@ -6975,14 +4777,6 @@
    "name" : "_ZTTN7android16BnResultReceiverE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android16BpResultReceiverE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTN7android18ServiceManagerShim18RegistrationWaiterE"
-  },
-  {
    "name" : "_ZTTN7android18ServiceManagerShimE"
   },
   {
@@ -7046,14 +4840,6 @@
    "name" : "_ZTTN7android9RpcServerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZTTNSt3__119basic_ostringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE"
-  },
-  {
    "name" : "_ZTVN7android10AllocationE"
   },
   {
@@ -7122,6 +4908,10 @@
    "name" : "_ZTVN7android15IServiceManagerE"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZTVN7android15RpcTransportRawE"
+  },
+  {
    "name" : "_ZTVN7android16BnResultReceiverE"
   },
   {
@@ -7145,6 +4935,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android18RpcTransportCtxRawE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android18ServiceManagerShim18RegistrationWaiterE"
   },
   {
@@ -8679,7 +6473,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -8730,7 +6524,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
@@ -13117,104 +10911,6 @@
    "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" :
@@ -15700,849 +13396,6 @@
    "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" :
@@ -17064,6 +13917,23 @@
    "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" :
@@ -17082,6 +13952,22 @@
   },
   {
    "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" :
    [
@@ -17098,6 +13984,22 @@
   },
   {
    "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" :
    [
@@ -17746,114 +14648,6 @@
    "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" :
@@ -17926,114 +14720,6 @@
    "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" :
@@ -18314,48 +15000,6 @@
    "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" :
@@ -19101,6 +15745,19 @@
    "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" :
@@ -20208,6 +16865,12 @@
    "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" :
@@ -21002,6 +17665,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::stopRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder25stopRecordingTransactionsEv",
    "parameters" :
@@ -21015,6 +17679,7 @@
    "source_file" : "frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
+   "access" : "private",
    "function_name" : "android::BBinder::startRecordingTransactions",
    "linker_set_key" : "_ZN7android7BBinder26startRecordingTransactionsERKNS_6ParcelE",
    "parameters" :
@@ -22815,7 +19480,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIb",
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
   {
@@ -22961,7 +19626,7 @@
   },
   {
    "function_name" : "android::RpcServer::setPerSessionRootObject",
-   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEEPKvjEEE",
+   "linker_set_key" : "_ZN7android9RpcServer23setPerSessionRootObjectEONSt3__18functionIFNS_2spINS_7IBinderEEENS_2wpINS_10RpcSessionEEEPKvjEEE",
    "parameters" :
    [
     {
@@ -22969,7 +19634,23 @@
      "referenced_type" : "_ZTIPN7android9RpcServerE"
     },
     {
-     "referenced_type" : "_ZTIONSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
+     "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",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android9RpcServerE"
+    },
+    {
+     "referenced_type" : "_ZTIONSt3__18functionIFvN7android4base11borrowed_fdEEEE"
     }
    ],
    "return_type" : "_ZTIv",
@@ -24885,6 +21566,19 @@
    "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" :
@@ -24975,46 +21669,6 @@
    "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" :
@@ -25963,1062 +22617,6 @@
    "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" :
@@ -27849,10 +23447,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRA20_KDs",
-   "name" : "const char16_t (&)[20]",
-   "referenced_type" : "_ZTIA20_KDs",
-   "self_type" : "_ZTIRA20_KDs",
+   "linker_set_key" : "_ZTIRA1_KDs",
+   "name" : "const char16_t (&)[1]",
+   "referenced_type" : "_ZTIA1_KDs",
+   "self_type" : "_ZTIRA1_KDs",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -28058,7 +23656,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_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_x86_64_static_afdo-libbinder_lto-thin/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"
@@ -28758,10 +24356,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
-   "name" : "const android::String16::StaticData<20> &",
-   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIRKN7android8String1610StaticDataILj20EEE",
+   "linker_set_key" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
+   "name" : "const android::String16::StaticData<1> &",
+   "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIRKN7android8String1610StaticDataILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -30770,8 +26368,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_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
-   "self_type" : "_ZTIPKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_x86_64_static_afdo-libbinder/obj/external/fmtlib/src/format.sdump",
+   "referenced_type" : "_ZTIKN3fmt2v716basic_format_argINS0_20basic_format_contextINS0_6detail15buffer_appenderIcEEcEEEE#ODR:out/soong/.intermediates/external/fmtlib/fmtlib/android_vendor.34_x86_x86_64_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_x86_x86_64_static_afdo-libbinder_lto-thin/obj/external/fmtlib/src/format.sdump",
    "size" : 4,
    "source_file" : "external/fmtlib/include/fmt/core.h"
   },
@@ -33414,10 +29012,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android14StaticString16ILj20EEE",
-   "name" : "android::StaticString16<20> *",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "self_type" : "_ZTIPN7android14StaticString16ILj20EEE",
+   "linker_set_key" : "_ZTIPN7android14StaticString16ILj1EEE",
+   "name" : "android::StaticString16<1> *",
+   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "self_type" : "_ZTIPN7android14StaticString16ILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -34098,6 +29696,15 @@
   },
   {
    "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",
@@ -34728,10 +30335,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj20EEE",
-   "name" : "android::String16::StaticData<20> *",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIPN7android8String1610StaticDataILj20EEE",
+   "linker_set_key" : "_ZTIPN7android8String1610StaticDataILj1EEE",
+   "name" : "android::String16::StaticData<1> *",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIPN7android8String1610StaticDataILj1EEE",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
@@ -35564,6 +31171,16 @@
    "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",
@@ -35574,16 +31191,6 @@
    "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" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIA20_Ky",
@@ -37832,11 +33439,11 @@
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "name" : "const android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIKN7android8String1610StaticDataILj20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "name" : "const android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIKN7android8String1610StaticDataILj1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -37956,7 +33563,7 @@
    "name" : "const android::RpcServer",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIKN7android9RpcServerE",
-   "size" : 176,
+   "size" : 200,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
   {
@@ -39357,6 +34964,46 @@
      "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",
@@ -50434,15 +46081,15 @@
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj20EEE"
+     "referenced_type" : "_ZTIKN7android8String1610StaticDataILj1EEE"
     }
    ],
-   "linker_set_key" : "_ZTIN7android14StaticString16ILj20EEE",
-   "name" : "android::StaticString16<20>",
+   "linker_set_key" : "_ZTIN7android14StaticString16ILj1EEE",
+   "name" : "android::StaticString16<1>",
    "record_kind" : "class",
-   "referenced_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "self_type" : "_ZTIN7android14StaticString16ILj20EEE",
-   "size" : 48,
+   "referenced_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "self_type" : "_ZTIN7android14StaticString16ILj1EEE",
+   "size" : 12,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -53913,7 +49560,7 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.34_x86_x86_64_shared/obj/frameworks/native/libs/binder/Binder.sdump"
+     "referenced_type" : "_ZTIPN7android9RpcServerE#ODR:out/soong/.intermediates/frameworks/native/libs/binder/libbinder/android_vendor.34_x86_x86_64_shared/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/native/libs/binder/Binder.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android2spINS_9RpcServerEEE",
@@ -53963,6 +49610,34 @@
     {
      "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"
     },
     {
@@ -61445,6 +57120,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 408,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -63546,14 +59227,14 @@
     {
      "field_name" : "data",
      "field_offset" : 32,
-     "referenced_type" : "_ZTIA20_Ds"
+     "referenced_type" : "_ZTIA1_Ds"
     }
    ],
-   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "name" : "android::String16::StaticData<20>",
-   "referenced_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "self_type" : "_ZTIN7android8String1610StaticDataILj20EEE",
-   "size" : 44,
+   "linker_set_key" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "name" : "android::String16::StaticData<1>",
+   "referenced_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "self_type" : "_ZTIN7android8String1610StaticDataILj1EEE",
+   "size" : 8,
    "source_file" : "system/core/libutils/include/utils/String16.h"
   },
   {
@@ -63995,7 +59676,7 @@
      "access" : "private",
      "field_name" : "mRootObjectFactory",
      "field_offset" : 576,
-     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEEPKvjEEE"
+     "referenced_type" : "_ZTINSt3__18functionIFN7android2spINS1_7IBinderEEENS1_2wpINS1_10RpcSessionEEEPKvjEEE"
     },
     {
      "access" : "private",
@@ -64005,26 +59686,32 @@
     },
     {
      "access" : "private",
-     "field_name" : "mSessions",
+     "field_name" : "mServerSocketModifier",
      "field_offset" : 960,
+     "referenced_type" : "_ZTINSt3__18functionIFvN7android4base11borrowed_fdEEEE"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSessions",
+     "field_offset" : 1152,
      "referenced_type" : "_ZTINSt3__13mapINS_6vectorIhNS_9allocatorIhEEEEN7android2spINS5_10RpcSessionEEENS_4lessIS4_EENS2_INS_4pairIKS4_S8_EEEEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownTrigger",
-     "field_offset" : 1056,
+     "field_offset" : 1248,
      "referenced_type" : "_ZTINSt3__110unique_ptrIN7android9FdTriggerENS_14default_deleteIS2_EEEE"
     },
     {
      "access" : "private",
      "field_name" : "mShutdownCv",
-     "field_offset" : 1088,
+     "field_offset" : 1280,
      "referenced_type" : "_ZTINSt3__118condition_variableE"
     },
     {
      "access" : "private",
      "field_name" : "mAcceptFn",
-     "field_offset" : 1152,
+     "field_offset" : 1344,
      "referenced_type" : "_ZTINSt3__18functionIFiRKN7android9RpcServerEPNS1_14RpcTransportFdEEEE"
     }
    ],
@@ -64033,12 +59720,12 @@
    "record_kind" : "class",
    "referenced_type" : "_ZTIN7android9RpcServerE",
    "self_type" : "_ZTIN7android9RpcServerE",
-   "size" : 176,
+   "size" : 200,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h",
    "vtable_components" :
    [
     {
-     "component_value" : 168,
+     "component_value" : 192,
      "kind" : "vbase_offset"
     },
     {
@@ -64075,11 +59762,11 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -168,
+     "component_value" : -192,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -168,
+     "component_value" : -192,
      "kind" : "offset_to_top"
     },
     {
@@ -65226,10 +60913,10 @@
   },
   {
    "alignment" : 4,
-   "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",
+   "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",
    "size" : 4,
    "source_file" : "frameworks/native/libs/binder/include/binder/RpcServer.h"
   },
@@ -65262,6 +60949,15 @@
   },
   {
    "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/x86_x86_64/source-based/libc++.so.lsdump b/34/64/x86_x86_64/source-based/libc++.so.lsdump
index dcc4a65..19ea3cb 100644
--- a/34/64/x86_x86_64/source-based/libc++.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libc++.so.lsdump
@@ -2594,14 +2594,6 @@
    "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_"
   },
   {
@@ -4404,34 +4396,10 @@
   },
   {
    "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_"
   },
   {
@@ -4447,22 +4415,6 @@
    "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"
   },
   {
@@ -4638,10 +4590,6 @@
    "name" : "_ZNSt3__121undeclare_no_pointersEPcj"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZNSt3__123mersenne_twister_engineIjLj32ELj624ELj397ELj31ELj2567483615ELj11ELj4294967295ELj7ELj2636928640ELj15ELj4022730752ELj18ELj1812433253EEclEv"
-  },
-  {
    "name" : "_ZNSt3__124__libcpp_debug_exceptionC1ERKNS_19__libcpp_debug_infoE"
   },
   {
@@ -5030,34 +4978,10 @@
   },
   {
    "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_"
   },
   {
@@ -5074,50 +4998,10 @@
   },
   {
    "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_"
   },
   {
@@ -5134,22 +5018,6 @@
   },
   {
    "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_"
   },
   {
@@ -9926,7 +9794,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_grouping",
+   "function_name" : "std::moneypunct<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -9940,7 +9808,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -9954,7 +9822,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -9968,7 +9836,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -9982,7 +9850,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -9996,7 +9864,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10010,7 +9878,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10024,7 +9892,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10038,7 +9906,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -10178,7 +10046,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -10192,7 +10060,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -10206,7 +10074,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -10220,7 +10088,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -10234,7 +10102,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -10248,7 +10116,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -10262,7 +10130,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -10276,7 +10144,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -10290,7 +10158,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__110moneypunctIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13209,7 +13077,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<char>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13223,7 +13091,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<char>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13237,7 +13105,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<char>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13251,7 +13119,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<char>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13265,7 +13133,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<char>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13279,7 +13147,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<char>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13293,7 +13161,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13307,7 +13175,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<char>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13321,7 +13189,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<char, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<char>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIcLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -13461,7 +13329,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_grouping",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_grouping",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE11do_groupingEv",
    "parameters" :
    [
@@ -13475,7 +13343,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_neg_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_neg_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_neg_formatEv",
    "parameters" :
    [
@@ -13489,7 +13357,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_pos_format",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_pos_format",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE13do_pos_formatEv",
    "parameters" :
    [
@@ -13503,7 +13371,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_curr_symbol",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_curr_symbol",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_curr_symbolEv",
    "parameters" :
    [
@@ -13517,7 +13385,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_frac_digits",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_frac_digits",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE14do_frac_digitsEv",
    "parameters" :
    [
@@ -13531,7 +13399,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_decimal_point",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_decimal_point",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_decimal_pointEv",
    "parameters" :
    [
@@ -13545,7 +13413,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_negative_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_negative_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_negative_signEv",
    "parameters" :
    [
@@ -13559,7 +13427,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_positive_sign",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_positive_sign",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_positive_signEv",
    "parameters" :
    [
@@ -13573,7 +13441,7 @@
   },
   {
    "access" : "protected",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::do_thousands_sep",
+   "function_name" : "std::moneypunct_byname<wchar_t>::do_thousands_sep",
    "linker_set_key" : "_ZNKSt3__117moneypunct_bynameIwLb0EE16do_thousands_sepEv",
    "parameters" :
    [
@@ -20304,50 +20172,6 @@
    "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" :
@@ -28528,7 +28352,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<char, false>::init",
+   "function_name" : "std::moneypunct_byname<char>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIcLb0EE4initEPKc",
    "parameters" :
    [
@@ -28562,7 +28386,7 @@
   },
   {
    "access" : "private",
-   "function_name" : "std::moneypunct_byname<wchar_t, false>::init",
+   "function_name" : "std::moneypunct_byname<wchar_t>::init",
    "linker_set_key" : "_ZNSt3__117moneypunct_bynameIwLb0EE4initEPKc",
    "parameters" :
    [
@@ -28596,121 +28420,6 @@
   },
   {
    "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" :
    [
@@ -28734,29 +28443,6 @@
   },
   {
    "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" :
    [
@@ -28848,98 +28534,6 @@
    ]
   },
   {
-   "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",
@@ -29751,19 +29345,6 @@
    "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" :
@@ -31804,136 +31385,6 @@
   },
   {
    "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" :
    [
@@ -31960,32 +31411,6 @@
   },
   {
    "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" :
    [
@@ -32089,255 +31514,6 @@
    ]
   },
   {
-   "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" :
@@ -32368,35 +31544,6 @@
   },
   {
    "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" :
    [
@@ -32512,122 +31659,6 @@
    ]
   },
   {
-   "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" :
@@ -35512,13 +34543,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE2idE",
-   "name" : "std::moneypunct<char, false>::id",
+   "name" : "std::moneypunct<char>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIcLb0EE4intlE",
-   "name" : "std::moneypunct<char, false>::intl",
+   "name" : "std::moneypunct<char>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -35536,13 +34567,13 @@
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE2idE",
-   "name" : "std::moneypunct<wchar_t, false>::id",
+   "name" : "std::moneypunct<wchar_t>::id",
    "referenced_type" : "_ZTINSt3__16locale2idE",
    "source_file" : "external/libcxx/include/locale"
   },
   {
    "linker_set_key" : "_ZNSt3__110moneypunctIwLb0EE4intlE",
-   "name" : "std::moneypunct<wchar_t, false>::intl",
+   "name" : "std::moneypunct<wchar_t>::intl",
    "referenced_type" : "_ZTIKb",
    "source_file" : "external/libcxx/include/locale"
   },
@@ -55071,7 +54102,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55080,7 +54111,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<3600, 1>>, duration<long double, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<3600>>, duration<long double, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55095,7 +54126,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55104,7 +54135,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long double, ratio<60, 1>>, duration<long double, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long double, ratio<60>>, duration<long double, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIeNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55119,7 +54150,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEEEEE",
    "size" : 1,
@@ -55128,7 +54159,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<3600, 1>>, duration<long, ratio<3600, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<3600>>, duration<long, ratio<3600>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx3600ELx1EEEEES5_EEE",
    "size" : 1,
@@ -55143,7 +54174,7 @@
     }
    ],
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEEEEE",
    "size" : 1,
@@ -55152,7 +54183,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
-   "name" : "std::common_type<duration<long, ratio<60, 1>>, duration<long, ratio<60, 1>>>",
+   "name" : "std::common_type<duration<long, ratio<60>>, duration<long, ratio<60>>>",
    "referenced_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "self_type" : "_ZTINSt3__111common_typeIJNS_6chrono8durationIlNS_5ratioILx60ELx1EEEEES5_EEE",
    "size" : 1,
@@ -115260,7 +114291,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
-   "name" : "std::__make_tuple_indices<0, 0>",
+   "name" : "std::__make_tuple_indices<0>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj0ELj0EEE",
    "size" : 1,
@@ -115269,7 +114300,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
-   "name" : "std::__make_tuple_indices<1, 0>",
+   "name" : "std::__make_tuple_indices<1>",
    "referenced_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "self_type" : "_ZTINSt3__120__make_tuple_indicesILj1ELj0EEE",
    "size" : 1,
@@ -135524,7 +134555,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
-   "name" : "std::ratio<1000000000, 1>",
+   "name" : "std::ratio<1000000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000000ELx1EEE",
@@ -135534,7 +134565,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
-   "name" : "std::ratio<1000000, 1>",
+   "name" : "std::ratio<1000000>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1000000ELx1EEE",
@@ -135574,7 +134605,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx1ELx1EEE",
-   "name" : "std::ratio<1, 1>",
+   "name" : "std::ratio<1>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx1ELx1EEE",
@@ -135584,7 +134615,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx3600ELx1EEE",
-   "name" : "std::ratio<3600, 1>",
+   "name" : "std::ratio<3600>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx3600ELx1EEE",
@@ -135594,7 +134625,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__15ratioILx60ELx1EEE",
-   "name" : "std::ratio<60, 1>",
+   "name" : "std::ratio<60>",
    "record_kind" : "class",
    "referenced_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
    "self_type" : "_ZTINSt3__15ratioILx60ELx1EEE",
@@ -136706,7 +135737,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1000000000ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<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,
@@ -136715,7 +135746,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<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,
@@ -136724,7 +135755,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowINS2_ILx1ELx1000000000EEES3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1000000000>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<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,
@@ -136738,7 +135769,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -136747,7 +135778,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<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,
@@ -136784,7 +135815,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__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,
@@ -136793,7 +135824,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<3600>>::__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,
@@ -136830,7 +135861,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__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,
@@ -136839,7 +135870,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIeNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long double, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long double, std::ratio<60>>::__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,
@@ -136876,7 +135907,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__no_overflow<std::ratio<3600>, std::ratio<3600>>::__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,
@@ -136885,7 +135916,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx3600ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<3600, 1>>::__no_overflow<std::ratio<3600, 1>, std::ratio<3600, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<3600>>::__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,
@@ -136922,7 +135953,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__no_overflow<std::ratio<60>, std::ratio<60>>::__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,
@@ -136931,7 +135962,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIlNS_5ratioILx60ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long, std::ratio<60, 1>>::__no_overflow<std::ratio<60, 1>, std::ratio<60, 1>>",
+   "name" : "std::chrono::duration<long, std::ratio<60>>::__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,
@@ -136968,7 +135999,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1000000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -136977,7 +136008,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, 1>, std::ratio<1, 1000000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000000>>::__no_overflow<std::ratio<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,
@@ -137046,7 +136077,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1000000, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -137055,7 +136086,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, 1>, std::ratio<1, 1000000>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1, 1000000>>::__no_overflow<std::ratio<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,
@@ -137170,7 +136201,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_E5__mulILx1ELx1ELb0EEE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>::__mul<1, 1, false>",
+   "name" : "std::chrono::duration<long long, std::ratio<1>>::__no_overflow<std::ratio<1>, std::ratio<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,
@@ -137179,7 +136210,7 @@
   {
    "alignment" : 1,
    "linker_set_key" : "_ZTINSt3__16chrono8durationIxNS_5ratioILx1ELx1EEEE13__no_overflowIS3_S3_EE",
-   "name" : "std::chrono::duration<long long, std::ratio<1, 1>>::__no_overflow<std::ratio<1, 1>, std::ratio<1, 1>>",
+   "name" : "std::chrono::duration<long long, std::ratio<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/x86_x86_64/source-based/libcap.so.lsdump b/34/64/x86_x86_64/source-based/libcap.so.lsdump
index 2ccfa70..0a44b6b 100644
--- a/34/64/x86_x86_64/source-based/libcap.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libcap.so.lsdump
@@ -49,9 +49,6 @@
  "elf_functions" :
  [
   {
-   "name" : "_libcap_strdup"
-  },
-  {
    "name" : "cap_clear"
   },
   {
@@ -79,6 +76,9 @@
    "name" : "cap_fill"
   },
   {
+   "name" : "cap_fill_flag"
+  },
+  {
    "name" : "cap_free"
   },
   {
@@ -121,12 +121,21 @@
    "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"
   },
   {
@@ -184,6 +193,9 @@
    "name" : "cap_prctlw"
   },
   {
+   "name" : "cap_proc_root"
+  },
+  {
    "name" : "cap_reset_ambient"
   },
   {
@@ -521,6 +533,27 @@
    "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" :
@@ -683,6 +716,33 @@
    "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" :
@@ -716,6 +776,18 @@
    "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",
@@ -823,7 +895,7 @@
      "referenced_type" : "_ZTIPFiPvE"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -838,7 +910,7 @@
      "referenced_type" : "_ZTIPKc"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -868,7 +940,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -889,7 +961,7 @@
      "referenced_type" : "_ZTIPKj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -904,7 +976,7 @@
      "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libcap/libcap/include/sys/capability.h"
   },
   {
@@ -998,6 +1070,18 @@
    "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/x86_x86_64/source-based/libcodec2.so.lsdump b/34/64/x86_x86_64/source-based/libcodec2.so.lsdump
index 567752b..0c8f2c7 100644
--- a/34/64/x86_x86_64/source-based/libcodec2.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libcodec2.so.lsdump
@@ -43,7 +43,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -115,7 +115,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA1_Pv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -178,7 +178,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -268,7 +268,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA6_Pv",
    "size" : 24,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -277,7 +277,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -286,7 +286,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 1,
@@ -1268,7 +1268,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -1284,11 +1284,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -1297,7 +1297,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -1754,7 +1754,7 @@
      "name" : "C2FrameData::FLAG_CORRUPT"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
    ],
@@ -2492,7 +2492,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -16,
+     "enum_field_value" : 18446744073709551600,
      "name" : "C2MemoryUsage::PLATFORM_MASK"
     }
    ],
@@ -3618,7 +3618,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Info::PARAM_KIND"
     }
    ],
@@ -3976,7 +3976,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Param::CoreIndex::KIND_MASK"
     },
     {
@@ -3988,11 +3988,11 @@
      "name" : "C2Param::CoreIndex::KIND_TUNING"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "C2Param::CoreIndex::KIND_SETTING"
     },
     {
-     "enum_field_value" : -1073741824,
+     "enum_field_value" : 3221225472,
      "name" : "C2Param::CoreIndex::KIND_INFO"
     },
     {
@@ -4280,11 +4280,11 @@
      "name" : "C2Config::API_SAME_INPUT_BUFFER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "C2Config::API_STREAMS"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "C2Config::API_TUNNELING"
     }
    ],
@@ -5895,7 +5895,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "C2Setting::PARAM_KIND"
     }
    ],
@@ -5923,7 +5923,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -5941,7 +5941,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5974,7 +5974,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -5989,7 +5989,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6007,7 +6007,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6025,7 +6025,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6052,7 +6052,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -6073,7 +6073,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6091,7 +6091,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6112,7 +6112,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6136,7 +6136,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6172,7 +6172,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6211,7 +6211,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6247,7 +6247,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6286,7 +6286,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6319,7 +6319,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6337,7 +6337,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6358,7 +6358,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6379,7 +6379,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   }
  ],
  "functions" : [],
@@ -6702,7 +6702,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6711,7 +6711,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -6756,7 +6756,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6765,7 +6765,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -6945,7 +6945,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7017,7 +7017,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7224,7 +7224,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7233,7 +7233,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7242,7 +7242,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7251,7 +7251,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7260,7 +7260,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7269,7 +7269,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7278,7 +7278,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7287,7 +7287,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7296,7 +7296,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7305,7 +7305,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7314,7 +7314,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7323,7 +7323,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7332,7 +7332,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7341,7 +7341,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7350,7 +7350,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7359,7 +7359,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7368,7 +7368,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7377,7 +7377,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7386,7 +7386,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7413,7 +7413,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7449,7 +7449,7 @@
    "referenced_type" : "_ZTIK13native_handle",
    "self_type" : "_ZTIPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -7494,7 +7494,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7782,7 +7782,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -7791,7 +7791,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -7800,7 +7800,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -8165,7 +8165,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -8225,7 +8225,7 @@
    "referenced_type" : "_ZTI13native_handle",
    "self_type" : "_ZTIK13native_handle",
    "size" : 12,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -8275,7 +8275,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -9020,7 +9020,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9076,7 +9076,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -9560,7 +9560,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10028,7 +10028,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10620,7 +10620,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10987,7 +10987,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86_x86_64/source-based/libcrypto.so.lsdump b/34/64/x86_x86_64/source-based/libcrypto.so.lsdump
index 074372b..af8cea7 100644
--- a/34/64/x86_x86_64/source-based/libcrypto.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libcrypto.so.lsdump
@@ -38,15 +38,6 @@
    "source_file" : "external/boringssl/src/include/openssl/cipher.h"
   },
   {
-   "alignment" : 4,
-   "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]",
@@ -120,11 +111,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -612,6 +603,9 @@
    "name" : "ASN1_TIME_set_string"
   },
   {
+   "name" : "ASN1_TIME_set_string_X509"
+  },
+  {
    "name" : "ASN1_TIME_to_generalizedtime"
   },
   {
@@ -1863,18 +1857,6 @@
    "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"
   },
   {
@@ -2616,6 +2598,18 @@
    "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"
   },
   {
@@ -3072,6 +3066,15 @@
    "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"
   },
   {
@@ -3507,6 +3510,9 @@
    "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,6 +3732,9 @@
    "name" : "EVP_sha256"
   },
   {
+   "name" : "EVP_sha256_final_with_secret_suffix"
+  },
+  {
    "name" : "EVP_sha384"
   },
   {
@@ -4170,6 +4179,69 @@
    "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"
   },
   {
@@ -4776,6 +4848,27 @@
    "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"
   },
   {
@@ -7365,36 +7458,9 @@
    "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"
   },
   {
@@ -7413,24 +7479,9 @@
    "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"
   },
   {
@@ -8495,23 +8546,23 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
-   "name" : "int (int (*)(const void *const *, const void *const *), const void *const *, const void *const *)",
+   "linker_set_key" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
+   "name" : "int (int (*)(const void *const *, const void *const *), const void *, const void *)",
    "parameters" :
    [
     {
      "referenced_type" : "_ZTIPFiPKPKvS2_E"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     },
     {
-     "referenced_type" : "_ZTIPKPKv"
+     "referenced_type" : "_ZTIPKv"
     }
    ],
-   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "referenced_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "return_type" : "_ZTIi",
-   "self_type" : "_ZTIFiPFiPKPKvS2_ES2_S2_E",
+   "self_type" : "_ZTIFiPFiPKPKvS2_ES0_S0_E",
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
   {
@@ -8875,6 +8926,30 @@
      "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_x86_x86_64_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_x86_x86_64_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_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -10375,6 +10450,21 @@
    "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" :
@@ -16252,6 +16342,21 @@
    "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" :
@@ -17311,6 +17416,135 @@
    "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" :
@@ -19195,6 +19429,12 @@
    "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",
@@ -20719,6 +20959,318 @@
    "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" :
@@ -27234,10 +27786,10 @@
      "referenced_type" : "_ZTIPFiPK15x509_purpose_stPK7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIPv"
@@ -27306,7 +27858,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
    "return_type" : "_ZTIi",
@@ -29322,7 +29874,7 @@
      "referenced_type" : "_ZTIPFiP13x509_trust_stP7x509_stiE"
     },
     {
-     "referenced_type" : "_ZTIPc"
+     "referenced_type" : "_ZTIPKc"
     },
     {
      "referenced_type" : "_ZTIi"
@@ -30111,7 +30663,7 @@
      "referenced_type" : "_ZTIPK14asn1_string_st"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIi",
@@ -31356,7 +31908,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -31377,7 +31929,7 @@
      "referenced_type" : "_ZTIl"
     },
     {
-     "referenced_type" : "_ZTIPl"
+     "referenced_type" : "_ZTIPKl"
     }
    ],
    "return_type" : "_ZTIP14asn1_string_st",
@@ -35731,114 +36283,6 @@
    "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" :
@@ -35851,48 +36295,6 @@
    "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",
@@ -35971,66 +36373,6 @@
    "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" :
@@ -36046,18 +36388,6 @@
    "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" :
@@ -36888,24 +37218,6 @@
   },
   {
    "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",
@@ -37023,6 +37335,15 @@
   },
   {
    "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",
@@ -37914,10 +38235,10 @@
   },
   {
    "alignment" : 4,
-   "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",
+   "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",
    "size" : 4,
    "source_file" : "external/boringssl/src/include/openssl/stack.h"
   },
@@ -38069,6 +38390,15 @@
    "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_x86_x86_64_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_x86_x86_64_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_x86_x86_64_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_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
@@ -38339,6 +38669,15 @@
    "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_x86_x86_64_shared/obj/external/boringssl/src/crypto/pkcs8/pkcs8_x509.sdump",
+   "self_type" : "_ZTIPK12ASN1_ITEM_st",
+   "size" : 4,
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPK12ASN1_ITEM_st",
+   "name" : "const ASN1_ITEM_st *",
    "referenced_type" : "_ZTIK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "self_type" : "_ZTIPK12ASN1_ITEM_st#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump",
    "size" : 4,
@@ -39120,12 +39459,21 @@
   },
   {
    "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/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
   {
    "alignment" : 4,
@@ -39327,15 +39675,6 @@
   },
   {
    "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",
@@ -39737,7 +40076,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
    "alignment" : 4,
@@ -39809,7 +40148,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/bio.h"
   },
   {
    "alignment" : 4,
@@ -39889,7 +40228,7 @@
    "name" : "const ec_group_st",
    "referenced_type" : "_ZTI11ec_group_st",
    "self_type" : "_ZTIK11ec_group_st",
-   "size" : 344,
+   "size" : 480,
    "source_file" : "external/boringssl/src/include/openssl/ec.h"
   },
   {
@@ -40211,7 +40550,7 @@
    "name" : "const evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTIK15evp_hpke_ctx_st",
-   "size" : 700,
+   "size" : 684,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40231,7 +40570,7 @@
    "name" : "const evp_hpke_kem_st",
    "referenced_type" : "_ZTI15evp_hpke_kem_st",
    "self_type" : "_ZTIK15evp_hpke_kem_st",
-   "size" : 36,
+   "size" : 44,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -40631,17 +40970,15 @@
    "name" : "const dsa_st",
    "referenced_type" : "_ZTI6dsa_st",
    "self_type" : "_ZTIK6dsa_st",
-   "size" : 84,
+   "size" : 76,
    "source_file" : "external/boringssl/src/include/openssl/dsa.h"
   },
   {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
-   "size" : 140,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -40763,12 +41100,22 @@
    "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/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/asn1t.h"
   },
   {
    "alignment" : 4,
@@ -41021,6 +41368,42 @@
     {
      "field_name" : "asn1_cb",
      "field_offset" : 96,
+     "referenced_type" : "_ZTIPFiiPP13ASN1_VALUE_stPK12ASN1_ITEM_stPvE#ODR:out/soong/.intermediates/external/boringssl/libcrypto/android_vendor.34_x86_x86_64_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_x86_x86_64_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_x86_x86_64_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_x86_x86_64_shared/obj/external/boringssl/src/crypto/x509/a_sign.sdump"
     },
     {
@@ -42170,7 +42553,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4672,
+     "field_offset" : 4544,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -42178,7 +42561,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 588,
+   "size" : 572,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -42206,22 +42589,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4800,
+     "field_offset" : 4672,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4992,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5504,
+     "field_offset" : 5376,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5568,
+     "field_offset" : 5440,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -42229,7 +42612,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 700,
+   "size" : 684,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -42522,7 +42905,7 @@
     {
      "field_name" : "block",
      "field_offset" : 640,
-     "referenced_type" : "_ZTIN16blake2b_state_stUt_E"
+     "referenced_type" : "_ZTIA128_h"
     },
     {
      "field_name" : "block_used",
@@ -43052,7 +43435,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -43064,7 +43447,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 580,
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -43253,249 +43636,6 @@
    "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" : 4,
-   "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" : 140,
-   "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"
     },
@@ -43776,28 +43916,6 @@
    "source_file" : "external/boringssl/src/include/openssl/kyber.h"
   },
   {
-   "alignment" : 4,
-   "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/x86_x86_64/source-based/libcrypto_utils.so.lsdump b/34/64/x86_x86_64/source-based/libcrypto_utils.so.lsdump
index 0db506f..a9ad8f0 100644
--- a/34/64/x86_x86_64/source-based/libcrypto_utils.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libcrypto_utils.so.lsdump
@@ -137,13 +137,11 @@
  "qualified_types" :
  [
   {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
-   "size" : 140,
    "source_file" : "system/core/libcrypto_utils/include/crypto_utils/android_pubkey.h"
   },
   {
diff --git a/34/64/x86_x86_64/source-based/libcurl.so.lsdump b/34/64/x86_x86_64/source-based/libcurl.so.lsdump
index 512f187..c4b359a 100644
--- a/34/64/x86_x86_64/source-based/libcurl.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libcurl.so.lsdump
@@ -111,12 +111,6 @@
    "name" : "Curl_all_content_encodings"
   },
   {
-   "name" : "Curl_alpn_get_proxy_spec"
-  },
-  {
-   "name" : "Curl_alpn_get_spec"
-  },
-  {
    "name" : "Curl_alpn_set_negotiated"
   },
   {
@@ -207,9 +201,81 @@
    "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"
   },
   {
@@ -279,6 +345,9 @@
    "name" : "Curl_cf_def_send"
   },
   {
+   "name" : "Curl_cf_h1_proxy_insert_after"
+  },
+  {
    "name" : "Curl_cf_happy_eyeballs_create"
   },
   {
@@ -291,6 +360,9 @@
    "name" : "Curl_cf_http_connect_insert_after"
   },
   {
+   "name" : "Curl_cf_http_proxy_get_host"
+  },
+  {
    "name" : "Curl_cf_http_proxy_insert_after"
   },
   {
@@ -366,15 +438,15 @@
    "name" : "Curl_conn_cf_data_pending"
   },
   {
-   "name" : "Curl_conn_cf_discard"
-  },
-  {
    "name" : "Curl_conn_cf_discard_all"
   },
   {
    "name" : "Curl_conn_cf_discard_chain"
   },
   {
+   "name" : "Curl_conn_cf_discard_sub"
+  },
+  {
    "name" : "Curl_conn_cf_get_select_socks"
   },
   {
@@ -384,6 +456,9 @@
    "name" : "Curl_conn_cf_insert_after"
   },
   {
+   "name" : "Curl_conn_cf_is_ssl"
+  },
+  {
    "name" : "Curl_conn_cf_recv"
   },
   {
@@ -438,9 +513,6 @@
    "name" : "Curl_conn_haproxy_add"
   },
   {
-   "name" : "Curl_conn_http_proxy_add"
-  },
-  {
    "name" : "Curl_conn_is_alive"
   },
   {
@@ -609,6 +681,72 @@
    "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"
   },
   {
@@ -681,6 +819,15 @@
    "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"
   },
   {
@@ -783,6 +930,9 @@
    "name" : "Curl_http_cookies"
   },
   {
+   "name" : "Curl_http_decode_status"
+  },
+  {
    "name" : "Curl_http_done"
   },
   {
@@ -810,6 +960,24 @@
    "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"
   },
   {
@@ -1485,6 +1653,9 @@
    "name" : "Curl_updatesocket"
   },
   {
+   "name" : "Curl_url_set_authority"
+  },
+  {
    "name" : "Curl_urldecode"
   },
   {
@@ -1848,6 +2019,9 @@
    "name" : "Curl_cfree"
   },
   {
+   "name" : "Curl_cft_h1_proxy"
+  },
+  {
    "name" : "Curl_cft_happy_eyeballs"
   },
   {
@@ -4255,6 +4429,10 @@
      "name" : "CURLPROXY_HTTPS"
     },
     {
+     "enum_field_value" : 3,
+     "name" : "CURLPROXY_HTTPS2"
+    },
+    {
      "enum_field_value" : 4,
      "name" : "CURLPROXY_SOCKS4"
     },
diff --git a/34/64/x86_x86_64/source-based/libdiskconfig.so.lsdump b/34/64/x86_x86_64/source-based/libdiskconfig.so.lsdump
deleted file mode 100644
index 18926e4..0000000
--- a/34/64/x86_x86_64/source-based/libdiskconfig.so.lsdump
+++ /dev/null
@@ -1,641 +0,0 @@
-{
- "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,
-   "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" : 4,
-   "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" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "next",
-     "referenced_type" : "_ZTIP10write_list"
-    },
-    {
-     "field_name" : "offset",
-     "field_offset" : 32,
-     "referenced_type" : "_ZTIx"
-    },
-    {
-     "field_name" : "len",
-     "field_offset" : 96,
-     "referenced_type" : "_ZTIj"
-    },
-    {
-     "field_name" : "data",
-     "field_offset" : 128,
-     "referenced_type" : "_ZTIA0_h"
-    }
-   ],
-   "linker_set_key" : "_ZTI10write_list",
-   "name" : "write_list",
-   "referenced_type" : "_ZTI10write_list",
-   "self_type" : "_ZTI10write_list",
-   "size" : 16,
-   "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/x86_x86_64/source-based/libdmabufheap.so.lsdump b/34/64/x86_x86_64/source-based/libdmabufheap.so.lsdump
index 310b5b3..35864ff 100644
--- a/34/64/x86_x86_64/source-based/libdmabufheap.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libdmabufheap.so.lsdump
@@ -1500,7 +1500,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "fmt::detail::is_unpacked_bit"
     }
    ],
@@ -1551,7 +1551,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "fmt::detail::has_named_args_bit"
     }
    ],
diff --git a/34/64/x86_x86_64/source-based/libdumpstateutil.so.lsdump b/34/64/x86_x86_64/source-based/libdumpstateutil.so.lsdump
index f5754d7..01f6102 100644
--- a/34/64/x86_x86_64/source-based/libdumpstateutil.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libdumpstateutil.so.lsdump
@@ -152,6 +152,9 @@
    "name" : "_ZN7android2os9dumpstate14RunCommandToFdEiRKNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEERKNS2_6vectorIS8_NS6_IS8_EEEERKNS1_14CommandOptionsE"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsStrictRunEv"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11IsUserBuildEv"
   },
   {
@@ -201,6 +204,9 @@
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper11build_type_E"
   },
   {
+   "name" : "_ZN7android2os9dumpstate16PropertiesHelper11strict_run_E"
+  },
+  {
    "name" : "_ZN7android2os9dumpstate16PropertiesHelper13parallel_run_E"
   },
   {
@@ -573,6 +579,12 @@
    "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",
@@ -711,6 +723,13 @@
   },
   {
    "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/x86_x86_64/source-based/libgralloctypes.so.lsdump b/34/64/x86_x86_64/source-based/libgralloctypes.so.lsdump
index 123e644..c549474 100644
--- a/34/64/x86_x86_64/source-based/libgralloctypes.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libgralloctypes.so.lsdump
@@ -2876,11 +2876,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -3467,11 +3467,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -4052,11 +4052,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
diff --git a/34/64/x86_x86_64/source-based/libhardware.so.lsdump b/34/64/x86_x86_64/source-based/libhardware.so.lsdump
index a385fd5..d9bf0a8 100644
--- a/34/64/x86_x86_64/source-based/libhardware.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libhardware.so.lsdump
@@ -16,7 +16,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25,7 +25,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -935,7 +935,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -956,7 +956,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "functions" :
@@ -974,7 +974,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "function_name" : "hw_get_module_by_class",
@@ -992,7 +992,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "global_vars" : [],
@@ -1006,7 +1006,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1015,7 +1015,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1033,7 +1033,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1042,7 +1042,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1051,7 +1051,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1060,7 +1060,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1069,7 +1069,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1078,7 +1078,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1087,7 +1087,7 @@
    "referenced_type" : "_ZTIPK11hw_module_t",
    "self_type" : "_ZTIPPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1118,7 +1118,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 1,
@@ -1128,7 +1128,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   }
  ],
  "record_types" :
@@ -1167,7 +1167,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1223,7 +1223,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -1414,7 +1414,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86_x86_64/source-based/libhidlbase.so.lsdump b/34/64/x86_x86_64/source-based/libhidlbase.so.lsdump
index 797c788..928d88f 100644
--- a/34/64/x86_x86_64/source-based/libhidlbase.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libhidlbase.so.lsdump
@@ -263,14 +263,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl4base4V1_05IBaseEEaSINS1_7manager4V1_215IServiceManagerEEERS5_ONS0_IT_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_015IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEaSEOS5_"
   },
   {
@@ -283,10 +275,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_115IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IClientCallbackEEaSEOS5_"
   },
   {
@@ -299,10 +287,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSERKS5_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_4hidl7manager4V1_215IServiceManagerEEaSINS_8hardware18NoHwServiceManagerEEERS5_ONS0_IT_EE"
   },
   {
@@ -311,11 +295,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware27hidl_binder_death_recipientEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_"
+   "name" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_"
   },
   {
    "binding" : "weak",
@@ -1889,22 +1873,6 @@
    "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"
   },
   {
@@ -1920,22 +1888,6 @@
    "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"
   },
   {
@@ -2397,26 +2349,6 @@
   },
   {
    "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"
   },
   {
@@ -2820,10 +2752,6 @@
   },
   {
    "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"
   },
   {
@@ -2840,10 +2768,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__112regex_traitsIcE9transformIPcEENS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEET_SA_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__113__empty_stateIcE6__execERNS_7__stateIcEE"
   },
   {
@@ -2904,10 +2828,6 @@
   },
   {
    "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_"
   },
   {
@@ -2916,10 +2836,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNKSt3__18functionIFbbEEclEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNKSt3__18functionIFvN7android8hardware7details16HidlInstrumentor20InstrumentationEventEPKcS7_S7_S7_PNS_6vectorIPvNS_9allocatorIS9_EEEEEEclES5_S7_S7_S7_S7_SD_"
   },
   {
@@ -2928,14 +2844,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEE11make_sharedIJEEES5_DpOT_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__110shared_ptrIN7android8hardware7details24LazyServiceRegistrarImplEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE11__push_charEc"
   },
   {
@@ -2944,6 +2852,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_atomIPKcEET_S7_S7_"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE12__parse_grepIPKcEET_S7_S7_"
   },
   {
@@ -2956,18 +2868,10 @@
   },
   {
    "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_"
   },
   {
@@ -2984,14 +2888,6 @@
   },
   {
    "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"
   },
   {
@@ -3028,10 +2924,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE21__start_matching_listEb"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__111basic_regexIcNS_12regex_traitsIcEEE22__parse_ERE_expressionIPKcEET_S7_S7_"
   },
   {
@@ -3076,6 +2968,10 @@
   },
   {
    "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_"
   },
   {
@@ -3092,10 +2988,6 @@
   },
   {
    "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"
   },
   {
@@ -3104,22 +2996,10 @@
   },
   {
    "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"
   },
   {
@@ -3128,14 +3008,6 @@
   },
   {
    "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_"
   },
   {
@@ -3144,30 +3016,14 @@
   },
   {
    "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"
   },
   {
@@ -3180,10 +3036,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseIPKcNS_9allocatorIS2_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIPvNS_9allocatorIS1_EEED2Ev"
   },
   {
@@ -3192,14 +3044,6 @@
   },
   {
    "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"
   },
   {
@@ -3252,7 +3096,7 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113match_resultsIPKcNS_9allocatorINS_9sub_matchIS2_EEEEE6__initEjS2_S2_b"
+   "name" : "_ZNSt3__114__split_bufferIN7android2spINS1_8hardware27hidl_binder_death_recipientEEERNS_9allocatorIS5_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3260,46 +3104,10 @@
   },
   {
    "binding" : "weak",
-   "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_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferINS_4pairIjPKcEERNS_9allocatorIS4_EEED2Ev"
   },
   {
    "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_"
   },
   {
@@ -3320,10 +3128,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEENS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEE10push_frontERKS3_"
   },
   {
@@ -3332,10 +3136,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_7__stateIcEERNS_9allocatorIS3_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEE10push_frontEOS4_"
   },
   {
@@ -3344,19 +3144,15 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEENS_9allocatorIS4_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE10push_frontERKS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEE9push_backEOS4_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIPvRNS_9allocatorIS1_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIPNS_8functionIFvvEEERNS_9allocatorIS4_EEED2Ev"
   },
   {
    "binding" : "weak",
@@ -3424,26 +3220,10 @@
   },
   {
    "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_"
   },
   {
@@ -3480,70 +3260,26 @@
   },
   {
    "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_"
   },
   {
@@ -3560,10 +3296,6 @@
   },
   {
    "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_"
   },
   {
@@ -3576,11 +3308,7 @@
   },
   {
    "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_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_"
+   "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",
@@ -3596,14 +3324,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeINS_12__value_typeINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS_8functionIFN7android2spINS9_8hardware7IBinderEEEPvEEEEENS_19__map_value_compareIS7_SH_NS_4lessIS7_EELb1EEENS5_ISH_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_"
   },
   {
@@ -3624,19 +3344,15 @@
   },
   {
    "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_9allocatorIiEEE25__emplace_unique_key_argsIiJRKiEEENS_4pairINS_15__tree_iteratorIiPNS_11__tree_nodeIiPvEEiEEbEERKT_DpOT0_"
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_8hardware27hidl_binder_death_recipientEEENS_9allocatorIS5_EEE21__push_back_slow_pathIS5_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -3652,14 +3368,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN7android8hardware7details21ClientCounterCallback7ServiceENS_9allocatorIS5_EEE26__swap_out_circular_bufferERNS_14__split_bufferIS5_RS7_EE"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEE21__push_back_slow_pathIRKS6_EEvOT_"
   },
   {
@@ -3672,10 +3380,6 @@
   },
   {
    "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_"
   },
   {
@@ -3684,18 +3388,6 @@
   },
   {
    "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"
   },
   {
@@ -3720,18 +3412,10 @@
   },
   {
    "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"
   },
   {
@@ -3772,22 +3456,10 @@
   },
   {
    "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_"
   },
   {
@@ -3796,14 +3468,6 @@
   },
   {
    "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"
   },
   {
@@ -3812,10 +3476,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__18functionIFbbEEaSERKS2_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__18functionIFvRN7android8hardware6ParcelEEEC2ERKS6_"
   },
   {
@@ -4104,10 +3764,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_016BsServiceManagerE0_NS2_15IServiceManagerE"
   },
   {
@@ -4139,10 +3795,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_021BsServiceNotificationE0_NS2_20IServiceNotificationE"
   },
   {
@@ -4228,10 +3880,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS0_4base4V1_05IBaseE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTCN7android4hidl7manager4V1_216BsClientCallbackE0_NS2_15IClientCallbackE"
   },
   {
@@ -4379,10 +4027,6 @@
    "name" : "_ZTTN7android4hidl4base4V1_05IBaseE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl4base4V1_06BsBaseE"
-  },
-  {
    "name" : "_ZTTN7android4hidl4base4V1_08BnHwBaseE"
   },
   {
@@ -4392,10 +4036,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_015IServiceManagerE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_016BsServiceManagerE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_018BnHwServiceManagerE"
   },
   {
@@ -4405,10 +4045,6 @@
    "name" : "_ZTTN7android4hidl7manager4V1_020IServiceNotificationE"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_021BsServiceNotificationE"
-  },
-  {
    "name" : "_ZTTN7android4hidl7manager4V1_023BnHwServiceNotificationE"
   },
   {
@@ -4435,10 +4071,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZTTN7android4hidl7manager4V1_216BsClientCallbackE"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZTTN7android4hidl7manager4V1_216BsServiceManagerE"
   },
   {
@@ -8823,42 +8455,6 @@
    "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" :
@@ -8907,22 +8503,6 @@
    "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" :
@@ -8972,22 +8552,6 @@
   },
   {
    "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" :
    [
@@ -9020,22 +8584,6 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "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_8hardware27hidl_binder_death_recipientEEE"
-    },
-    {
-     "referenced_type" : "_ZTION7android2spINS_8hardware27hidl_binder_death_recipientEEE"
-    }
-   ],
-   "return_type" : "_ZTIRN7android2spINS_8hardware27hidl_binder_death_recipientEEE",
-   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
    "function_name" : "android::sp<android::hardware::IBinder>::operator=",
    "linker_set_key" : "_ZN7android2spINS_8hardware7IBinderEEaSEOS3_",
    "parameters" :
@@ -9052,6 +8600,22 @@
    "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::sp<android::hardware::details::Waiter>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_8hardware7details6WaiterEEaSEPS3_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "_ZTIPN7android2spINS_8hardware7details6WaiterEEE"
+    },
+    {
+     "referenced_type" : "_ZTIPN7android8hardware7details6WaiterE"
+    }
+   ],
+   "return_type" : "_ZTIRN7android2spINS_8hardware7details6WaiterEEE",
+   "source_file" : "system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "function_name" : "android::wp<android::hardware::BHwBinder>::operator=",
    "linker_set_key" : "_ZN7android2wpINS_8hardware9BHwBinderEEaSERKS3_",
    "parameters" :
@@ -17382,118 +16946,6 @@
    "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" :
@@ -17584,118 +17036,6 @@
    "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" :
@@ -19710,91 +19050,6 @@
   },
   {
    "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" :
    [
@@ -22164,8 +21419,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_x86_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
-   "self_type" : "_ZTIRKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_x86_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_x86_x86_64_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_x86_x86_64_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/obj/system/libhwbinder/BpHwBinder.sdump",
    "size" : 4,
    "source_file" : "system/core/libutils/include/utils/RefBase.h"
   },
@@ -23515,7 +22770,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_x86_x86_64_static_afdo-libhidlbase/obj/system/libhwbinder/BpHwBinder.sdump",
+   "referenced_type" : "_ZTIKN7android2spINS_8hardware7IBinder14DeathRecipientEEE#ODR:out/soong/.intermediates/system/libhwbinder/libhwbinder-impl-internal/android_vendor.34_x86_x86_64_static_afdo-libhidlbase/e560d7b19ebf7276b3e850d3d346dec8/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/x86_x86_64/source-based/libmedia_helper.so.lsdump b/34/64/x86_x86_64/source-based/libmedia_helper.so.lsdump
index 8825756..d8e1824 100644
--- a/34/64/x86_x86_64/source-based/libmedia_helper.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libmedia_helper.so.lsdump
@@ -667,21 +667,33 @@
    "name" : "_ZN7android14AudioParameter10keyRoutingE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10keyTtyModeE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter10valueFalseE"
   },
   {
+   "name" : "_ZN7android14AudioParameter10valueHacOnE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter11keyChannelsE"
   },
   {
    "name" : "_ZN7android14AudioParameter11keyHwAvSyncE"
   },
   {
+   "name" : "_ZN7android14AudioParameter11valueHacOffE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter12keyProgramIdE"
   },
   {
    "name" : "_ZN7android14AudioParameter13keyFrameCountE"
   },
   {
+   "name" : "_ZN7android14AudioParameter13keyHacSettingE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter13keyMonoOutputE"
   },
   {
@@ -703,6 +715,15 @@
    "name" : "_ZN7android14AudioParameter15keySamplingRateE"
   },
   {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeHcoE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeOffE"
+  },
+  {
+   "name" : "_ZN7android14AudioParameter15valueTtyModeVcoE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter16keyBtLeSuspendedE"
   },
   {
@@ -712,6 +733,9 @@
    "name" : "_ZN7android14AudioParameter16keyStreamConnectE"
   },
   {
+   "name" : "_ZN7android14AudioParameter16valueTtyModeFullE"
+  },
+  {
    "name" : "_ZN7android14AudioParameter17keyPresentationIdE"
   },
   {
@@ -1425,12 +1449,24 @@
    "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",
@@ -1443,6 +1479,12 @@
    "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",
@@ -1455,6 +1497,12 @@
    "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",
@@ -1497,6 +1545,24 @@
    "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",
@@ -1515,6 +1581,12 @@
    "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/x86_x86_64/source-based/libmedia_omx.so.lsdump b/34/64/x86_x86_64/source-based/libmedia_omx.so.lsdump
index c78e932..5ef97be 100644
--- a/34/64/x86_x86_64/source-based/libmedia_omx.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libmedia_omx.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -88,7 +88,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 2,
@@ -223,7 +223,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -241,7 +241,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -5548,7 +5548,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -5564,11 +5564,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -5577,7 +5577,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -5920,7 +5920,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -5936,71 +5936,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -10605,11 +10605,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -11196,11 +11196,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -11781,11 +11781,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12744,7 +12744,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12762,7 +12762,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12795,7 +12795,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12810,7 +12810,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12828,7 +12828,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12846,7 +12846,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12873,7 +12873,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -12918,7 +12918,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -12936,7 +12936,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12957,7 +12957,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -12981,7 +12981,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13017,7 +13017,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13056,7 +13056,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13092,7 +13092,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13131,7 +13131,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13164,7 +13164,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13182,7 +13182,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13218,7 +13218,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -13239,7 +13239,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17010,7 +17010,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17019,7 +17019,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17046,7 +17046,7 @@
    "referenced_type" : "_ZTI13android_ycbcr",
    "self_type" : "_ZTIP13android_ycbcr",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17073,7 +17073,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17100,7 +17100,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17118,7 +17118,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17235,7 +17235,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17244,7 +17244,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17253,7 +17253,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17262,7 +17262,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17271,7 +17271,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17280,7 +17280,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17289,7 +17289,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17307,7 +17307,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17316,7 +17316,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17325,7 +17325,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17334,7 +17334,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17343,7 +17343,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17352,7 +17352,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17361,7 +17361,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17370,7 +17370,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17379,7 +17379,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17388,7 +17388,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17406,7 +17406,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -17415,7 +17415,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -17442,7 +17442,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -17460,7 +17460,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -18886,6 +18886,15 @@
   },
   {
    "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",
@@ -18994,6 +19003,15 @@
   },
   {
    "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",
@@ -20340,7 +20358,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20367,7 +20385,7 @@
    "referenced_type" : "_ZTIPK13native_handle",
    "self_type" : "_ZTIPPK13native_handle",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -20547,7 +20565,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -20577,7 +20595,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22352,11 +22370,13 @@
    "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"
   },
   {
@@ -23164,7 +23184,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23220,7 +23240,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -23405,7 +23425,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23549,7 +23569,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -23842,7 +23862,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -24224,7 +24244,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -35343,6 +35363,12 @@
     },
     {
      "access" : "private",
+     "field_name" : "mServiceFuzzing",
+     "field_offset" : 408,
+     "referenced_type" : "_ZTIb"
+    },
+    {
+     "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 416,
      "referenced_type" : "_ZTIPFvPKhjPKyjE"
@@ -43447,6 +43473,15 @@
   },
   {
    "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/x86_x86_64/source-based/libprocessgroup.so.lsdump b/34/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
index a375167..a63c9c6 100644
--- a/34/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libprocessgroup.so.lsdump
@@ -145,6 +145,9 @@
    "name" : "_Z24SetProcessProfilesCachedjiRKNSt3__16vectorINS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEENS4_IS6_EEEE"
   },
   {
+   "name" : "_Z24isProfileValidForProcessRKNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEii"
+  },
+  {
    "name" : "_Z24sendSignalToProcessGroupjii"
   },
   {
@@ -246,7 +249,7 @@
    "name" : "_ZN16CgroupController8IsUsableEv"
   },
   {
-   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE"
+   "name" : "_ZN16ProfileAttribute5ResetERK16CgroupControllerRKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEESB_"
   },
   {
    "name" : "_ZN17IProfileAttributeD0Ev"
@@ -1134,9 +1137,15 @@
    "name" : "_ZNK11TaskProfile14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK11TaskProfile14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK11TaskProfile17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK11TaskProfile17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK12TaskProfiles10GetProfileENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEE"
   },
   {
@@ -1152,9 +1161,15 @@
    "name" : "_ZNK15SetCgroupAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15SetCgroupAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15SetCgroupAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15SetCgroupAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK15SetClampsAction14ExecuteForTaskEi"
   },
   {
@@ -1167,12 +1182,18 @@
    "name" : "_ZNK15WriteFileAction14ExecuteForTaskEi"
   },
   {
+   "name" : "_ZNK15WriteFileAction14IsValidForTaskEi"
+  },
+  {
    "name" : "_ZNK15WriteFileAction16WriteValueToFileERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEEN13ProfileAction17ResourceCacheTypeEiib"
   },
   {
    "name" : "_ZNK15WriteFileAction17ExecuteForProcessEji"
   },
   {
+   "name" : "_ZNK15WriteFileAction17IsValidForProcessEji"
+  },
+  {
    "name" : "_ZNK16CgroupController12GetTaskGroupEiPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE"
   },
   {
@@ -1200,21 +1221,42 @@
    "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/x86_x86_64/source-based/libsqlite.so.lsdump b/34/64/x86_x86_64/source-based/libsqlite.so.lsdump
index 4e71874..4282a1d 100644
--- a/34/64/x86_x86_64/source-based/libsqlite.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libsqlite.so.lsdump
@@ -337,6 +337,9 @@
    "name" : "sqlite3_interrupt"
   },
   {
+   "name" : "sqlite3_is_interrupted"
+  },
+  {
    "name" : "sqlite3_keyword_check"
   },
   {
@@ -691,6 +694,9 @@
    "name" : "sqlite3_value_dup"
   },
   {
+   "name" : "sqlite3_value_encoding"
+  },
+  {
    "name" : "sqlite3_value_free"
   },
   {
diff --git a/34/64/x86_x86_64/source-based/libssl.so.lsdump b/34/64/x86_x86_64/source-based/libssl.so.lsdump
index b197736..4b220fb 100644
--- a/34/64/x86_x86_64/source-based/libssl.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libssl.so.lsdump
@@ -20,6 +20,15 @@
    "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]",
@@ -65,6 +74,15 @@
    "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]",
@@ -119,6 +137,15 @@
    "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]",
@@ -165,11 +192,11 @@
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "_ZTIA580_h",
-   "name" : "unsigned char[580]",
+   "linker_set_key" : "_ZTIA564_h",
+   "name" : "unsigned char[564]",
    "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIA580_h",
-   "size" : 580,
+   "self_type" : "_ZTIA564_h",
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -200,6 +227,24 @@
    "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]",
@@ -510,6 +555,9 @@
    "name" : "SSL_CIPHER_get_digest_nid"
   },
   {
+   "name" : "SSL_CIPHER_get_handshake_digest"
+  },
+  {
    "name" : "SSL_CIPHER_get_id"
   },
   {
@@ -534,9 +582,6 @@
    "name" : "SSL_CIPHER_get_protocol_id"
   },
   {
-   "name" : "SSL_CIPHER_get_value"
-  },
-  {
    "name" : "SSL_CIPHER_get_version"
   },
   {
@@ -801,6 +846,9 @@
    "name" : "SSL_CTX_set1_ech_keys"
   },
   {
+   "name" : "SSL_CTX_set1_group_ids"
+  },
+  {
    "name" : "SSL_CTX_set1_groups"
   },
   {
@@ -1362,6 +1410,24 @@
    "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"
   },
   {
@@ -1422,6 +1488,12 @@
    "name" : "SSL_get_finished"
   },
   {
+   "name" : "SSL_get_group_id"
+  },
+  {
+   "name" : "SSL_get_group_name"
+  },
+  {
    "name" : "SSL_get_info_callback"
   },
   {
@@ -1443,6 +1515,9 @@
    "name" : "SSL_get_mode"
   },
   {
+   "name" : "SSL_get_negotiated_group"
+  },
+  {
    "name" : "SSL_get_options"
   },
   {
@@ -1713,6 +1788,9 @@
    "name" : "SSL_set1_ech_config_list"
   },
   {
+   "name" : "SSL_set1_group_ids"
+  },
+  {
    "name" : "SSL_set1_groups"
   },
   {
@@ -2091,6 +2169,9 @@
    "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"
   },
   {
@@ -6698,6 +6779,18 @@
    "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" :
@@ -6794,18 +6887,6 @@
    "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" :
@@ -7964,6 +8045,24 @@
    "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" :
@@ -10799,6 +10898,96 @@
    "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" :
@@ -11066,6 +11255,30 @@
    "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" :
@@ -11159,6 +11372,18 @@
    "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" :
@@ -12416,6 +12641,24 @@
    "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" :
@@ -14242,6 +14485,15 @@
   },
   {
    "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",
@@ -14269,6 +14521,15 @@
   },
   {
    "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",
@@ -14314,6 +14575,15 @@
   },
   {
    "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",
@@ -14323,6 +14593,15 @@
   },
   {
    "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",
@@ -14341,6 +14620,24 @@
   },
   {
    "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",
@@ -14368,6 +14665,24 @@
   },
   {
    "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",
@@ -14377,6 +14692,33 @@
   },
   {
    "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",
@@ -14530,6 +14872,15 @@
   },
   {
    "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",
@@ -14620,6 +14971,15 @@
   },
   {
    "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",
@@ -14740,15 +15100,6 @@
   },
   {
    "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",
@@ -14992,15 +15343,6 @@
   },
   {
    "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",
@@ -18223,6 +18565,15 @@
   },
   {
    "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",
@@ -18466,6 +18817,15 @@
   },
   {
    "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",
@@ -18475,6 +18835,15 @@
   },
   {
    "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",
@@ -18484,6 +18853,24 @@
   },
   {
    "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",
@@ -18529,6 +18916,15 @@
   },
   {
    "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",
@@ -19105,6 +19501,15 @@
   },
   {
    "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",
@@ -19114,6 +19519,24 @@
   },
   {
    "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",
@@ -19159,6 +19582,15 @@
   },
   {
    "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",
@@ -19321,15 +19753,6 @@
   },
   {
    "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",
@@ -19362,7 +19785,7 @@
    "referenced_type" : "_ZTIPKc",
    "self_type" : "_ZTIPPKc",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
+   "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
    "alignment" : 4,
@@ -19398,7 +19821,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIPPv",
    "size" : 4,
-   "source_file" : "external/boringssl/src/include/openssl/stack.h"
+   "source_file" : "external/boringssl/src/include/openssl/ssl.h"
   },
   {
    "alignment" : 4,
@@ -19468,6 +19891,16 @@
    "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",
@@ -19498,6 +19931,16 @@
    "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",
@@ -19538,6 +19981,16 @@
    "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",
@@ -19568,6 +20021,26 @@
    "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",
@@ -19868,7 +20341,7 @@
    "name" : "const evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTIK15evp_aead_ctx_st",
-   "size" : 588,
+   "size" : 572,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -20194,6 +20667,16 @@
    "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",
@@ -20366,13 +20849,11 @@
    "source_file" : "external/boringssl/src/include/openssl/bytestring.h"
   },
   {
-   "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "_ZTIK6rsa_st",
    "name" : "const rsa_st",
    "referenced_type" : "_ZTI6rsa_st",
    "self_type" : "_ZTIK6rsa_st",
-   "size" : 140,
    "source_file" : "external/boringssl/src/include/openssl/rsa.h"
   },
   {
@@ -20424,7 +20905,17 @@
    "name" : "const bssl::NamedGroup",
    "referenced_type" : "_ZTIN4bssl10NamedGroupE",
    "self_type" : "_ZTIKN4bssl10NamedGroupE",
-   "size" : 32,
+   "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,
    "source_file" : "external/boringssl/src/include/openssl/span.h"
   },
   {
@@ -20440,6 +20931,16 @@
   {
    "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",
@@ -20450,6 +20951,26 @@
   {
    "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",
@@ -20500,6 +21021,16 @@
   {
    "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",
@@ -20544,7 +21075,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" : 588,
+   "size" : 572,
    "source_file" : "external/boringssl/src/include/openssl/base.h"
   },
   {
@@ -22333,7 +22864,7 @@
     },
     {
      "field_name" : "tag_len",
-     "field_offset" : 4672,
+     "field_offset" : 4544,
      "referenced_type" : "_ZTIh"
     }
    ],
@@ -22341,7 +22872,7 @@
    "name" : "evp_aead_ctx_st",
    "referenced_type" : "_ZTI15evp_aead_ctx_st",
    "self_type" : "_ZTI15evp_aead_ctx_st",
-   "size" : 588,
+   "size" : 572,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -22369,22 +22900,22 @@
     },
     {
      "field_name" : "base_nonce",
-     "field_offset" : 4800,
+     "field_offset" : 4672,
      "referenced_type" : "_ZTIA24_h"
     },
     {
      "field_name" : "exporter_secret",
-     "field_offset" : 4992,
+     "field_offset" : 4864,
      "referenced_type" : "_ZTIA64_h"
     },
     {
      "field_name" : "seq",
-     "field_offset" : 5504,
+     "field_offset" : 5376,
      "referenced_type" : "_ZTIy"
     },
     {
      "field_name" : "is_sender",
-     "field_offset" : 5568,
+     "field_offset" : 5440,
      "referenced_type" : "_ZTIi"
     }
    ],
@@ -22392,7 +22923,7 @@
    "name" : "evp_hpke_ctx_st",
    "referenced_type" : "_ZTI15evp_hpke_ctx_st",
    "self_type" : "_ZTI15evp_hpke_ctx_st",
-   "size" : 700,
+   "size" : 684,
    "source_file" : "external/boringssl/src/include/openssl/hpke.h"
   },
   {
@@ -23158,7 +23689,7 @@
    [
     {
      "field_name" : "opaque",
-     "referenced_type" : "_ZTIA580_h"
+     "referenced_type" : "_ZTIA564_h"
     },
     {
      "field_name" : "alignment",
@@ -23170,7 +23701,7 @@
    "record_kind" : "union",
    "referenced_type" : "_ZTI21evp_aead_ctx_st_state",
    "self_type" : "_ZTI21evp_aead_ctx_st_state",
-   "size" : 580,
+   "size" : 564,
    "source_file" : "external/boringssl/src/include/openssl/aead.h"
   },
   {
@@ -23497,249 +24028,6 @@
    "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" : 4,
-   "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" : 140,
-   "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"
     },
@@ -24148,6 +24436,41 @@
    [
     {
      "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"
     }
    ],
@@ -24183,6 +24506,76 @@
    [
     {
      "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"
     }
    ],
@@ -24358,6 +24751,41 @@
    [
     {
      "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"
     }
    ],
@@ -26043,7 +26471,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" : 588,
+   "size" : 572,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26066,7 +26494,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" : 700,
+   "size" : 684,
    "source_file" : "external/boringssl/src/include/openssl/base.h",
    "template_args" :
    [
@@ -26331,6 +26759,20 @@
   },
   {
    "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",
@@ -26345,6 +26787,34 @@
   },
   {
    "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/x86_x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump b/34/64/x86_x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
index 0547276..5384ba9 100644
--- a/34/64/x86_x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -5450,7 +5450,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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -5480,7 +5480,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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h"
   },
   {
@@ -6733,13 +6733,19 @@
      "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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -6830,13 +6836,19 @@
      "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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueueBase.h",
    "template_args" :
    [
@@ -9099,7 +9111,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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
@@ -9118,7 +9130,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" : 24,
+   "size" : 28,
    "source_file" : "system/libfmq/include/fmq/MessageQueue.h",
    "template_args" :
    [
diff --git a/34/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/34/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index b57d79e..3435ed8 100644
--- a/34/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -981,6 +981,9 @@
    "name" : "_ZN7android19GraphicBufferSource7releaseEv"
   },
   {
+   "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource9configureERKNS_2spINS_16ComponentWrapperEEEiijjy"
   },
   {
@@ -11700,11 +11703,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -12291,11 +12294,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -12876,11 +12879,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -14473,6 +14476,37 @@
   },
   {
    "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/x86_x86_64/source-based/libstagefright_foundation.so.lsdump b/34/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump
index 484758a..ee3451a 100644
--- a/34/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libstagefright_foundation.so.lsdump
@@ -24050,7 +24050,7 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "_ZTIPN7android4ListINS_7ALooper5EventEE5_NodeE#ODR:out/soong/.intermediates/frameworks/av/media/module/foundation/libstagefright_foundation/android_vendor.34_x86_x86_64_static/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_x86_x86_64_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE",
@@ -24092,13 +24092,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_x86_x86_64_static/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_x86_x86_64_static/e560d7b19ebf7276b3e850d3d346dec8/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_x86_x86_64_static/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_x86_x86_64_static/e560d7b19ebf7276b3e850d3d346dec8/obj/frameworks/av/media/module/foundation/ALooper.sdump"
     }
    ],
    "linker_set_key" : "_ZTIN7android4ListINS_7ALooper5EventEE5_NodeE",
diff --git a/34/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump b/34/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
index 64ac504..3e7f526 100644
--- a/34/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libstagefright_omx.so.lsdump
@@ -642,6 +642,9 @@
    "name" : "_ZN7android22OmxGraphicBufferSource14onOmxExecutingEv"
   },
   {
+   "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjj"
+  },
+  {
    "name" : "_ZN7android22OmxGraphicBufferSource9configureERKNS_2spINS_15IOmxNodeWrapperEEEiijjy"
   },
   {
@@ -15368,6 +15371,37 @@
   },
   {
    "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" :
    [
@@ -43247,6 +43281,15 @@
   },
   {
    "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/x86_x86_64/source-based/libstagefright_omx_utils.so.lsdump b/34/64/x86_x86_64/source-based/libstagefright_omx_utils.so.lsdump
index ecf2ee5..924b220 100644
--- a/34/64/x86_x86_64/source-based/libstagefright_omx_utils.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libstagefright_omx_utils.so.lsdump
@@ -9853,11 +9853,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -24585,6 +24585,12 @@
     },
     {
      "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/x86_x86_64/source-based/libtinyalsa.so.lsdump b/34/64/x86_x86_64/source-based/libtinyalsa.so.lsdump
index 6822d0d..4aa0079 100644
--- a/34/64/x86_x86_64/source-based/libtinyalsa.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libtinyalsa.so.lsdump
@@ -218,6 +218,9 @@
    "name" : "pcm_get_subdevice"
   },
   {
+   "name" : "pcm_get_xruns"
+  },
+  {
    "name" : "pcm_ioctl"
   },
   {
@@ -1298,6 +1301,18 @@
    "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/x86_x86_64/source-based/libui.so.lsdump b/34/64/x86_x86_64/source-based/libui.so.lsdump
index 882bcdf..f08d455 100644
--- a/34/64/x86_x86_64/source-based/libui.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libui.so.lsdump
@@ -34,7 +34,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA12_j",
    "size" : 48,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -52,7 +52,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA25_j",
    "size" : 100,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -142,7 +142,7 @@
    "referenced_type" : "_ZTIPv",
    "self_type" : "_ZTIA7_Pv",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 1,
@@ -160,7 +160,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIA7_i",
    "size" : 28,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -859,10 +859,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_5FenceEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_5FenceEED2Ev"
   },
   {
@@ -871,18 +867,10 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEaSEOS6_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEaSEOS6_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_8hardware8graphics6mapper4V4_07IMapperEEaSEOS6_"
   },
   {
@@ -1213,6 +1201,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11hasInstanceEv"
   },
   {
@@ -1453,10 +1445,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common14ExtendableTypeEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper18metadataDumpHelperIN4aidl7android8hardware8graphics6common9DataspaceEEEiRKNS_8hardware8graphics6mapper4V4_07IMapper10BufferDumpENS6_20StandardMetadataTypeEPFiRKNS8_8hidl_vecIhEEPT_ESM_"
   },
   {
@@ -1465,21 +1453,9 @@
   },
   {
    "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"
   },
   {
@@ -1507,10 +1483,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getIN4aidl7android8hardware8graphics6common9DataspaceEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSB_8hidl_vecIhEEPT_ESO_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getINS_8hardware8graphics6common4V1_211PixelFormatEEEiPK13native_handleRKNS3_6mapper4V4_07IMapper12MetadataTypeEPFiRKNS2_8hidl_vecIhEEPT_ESL_"
   },
   {
@@ -1527,10 +1499,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNK7android14Gralloc4Mapper3getINSt3__18optionalINS2_6vectorIhNS2_9allocatorIhEEEEEEEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNSC_8hidl_vecIhEEPT_ESP_"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNK7android14Gralloc4Mapper3getIjEEiPK13native_handleRKNS_8hardware8graphics6mapper4V4_07IMapper12MetadataTypeEPFiRKNS5_8hidl_vecIhEEPT_ESI_"
   },
   {
@@ -1550,10 +1518,6 @@
    "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"
   },
   {
@@ -2342,10 +2306,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIPN7android5FenceENS_6vectorINS_8weak_ptrINS2_9FenceTimeEEENS_9allocatorIS8_EEEEEENS_22__unordered_map_hasherIS4_SC_NS_4hashIS4_EELb1EEENS_21__unordered_map_equalIS4_SC_NS_8equal_toIS4_EELb1EEENS9_ISC_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_"
   },
   {
@@ -2374,10 +2334,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common14ExtendableTypeENS_9allocatorIS6_EEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__113__vector_baseIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEED2Ev"
   },
   {
@@ -2386,31 +2342,15 @@
   },
   {
    "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_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEEC2EjjS9_"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentERNS_9allocatorIS6_EEED2Ev"
+   "name" : "_ZNSt3__114__split_bufferIN7android4RectERNS1_18InlineStdAllocatorIS2_Lj4EEEEC2EjjS5_"
   },
   {
    "binding" : "weak",
@@ -2418,14 +2358,6 @@
   },
   {
    "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_EEED2Ev"
   },
   {
@@ -2450,10 +2382,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__114__split_bufferIhRN7android18InlineStdAllocatorIhLj128EEEED2Ev"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEE7seekoffExNS_8ios_base7seekdirEj"
   },
   {
@@ -2502,30 +2430,14 @@
   },
   {
    "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_"
   },
   {
@@ -2538,26 +2450,10 @@
   },
   {
    "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_"
   },
   {
@@ -2566,15 +2462,11 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common20PlaneLayoutComponentENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE21__push_back_slow_pathIRKS2_EEvOT_"
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEE11__vallocateEj"
-  },
-  {
-   "binding" : "weak",
-   "name" : "_ZNSt3__16vectorIN4aidl7android8hardware8graphics6common3HdrENS_9allocatorIS6_EEEC2ERKS9_"
+   "name" : "_ZNSt3__16vectorIN7android16DumpBufferResultENS_9allocatorIS2_EEE7reserveEj"
   },
   {
    "binding" : "weak",
@@ -2590,10 +2482,6 @@
   },
   {
    "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_"
   },
   {
@@ -2614,14 +2502,6 @@
   },
   {
    "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"
   },
   {
@@ -2630,10 +2510,6 @@
   },
   {
    "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_"
   },
   {
@@ -2642,14 +2518,6 @@
   },
   {
    "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"
   },
   {
@@ -2662,26 +2530,10 @@
   },
   {
    "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"
   },
   {
@@ -2690,18 +2542,6 @@
   },
   {
    "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"
   },
   {
@@ -4023,7 +3863,7 @@
      "name" : "GRALLOC_USAGE_HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : -2097153,
+     "enum_field_value" : 4292870143,
      "name" : "GRALLOC_USAGE_ALLOC_MASK"
     },
     {
@@ -4039,11 +3879,11 @@
      "name" : "GRALLOC_USAGE_PRIVATE_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "GRALLOC_USAGE_PRIVATE_3"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "GRALLOC_USAGE_PRIVATE_MASK"
     }
    ],
@@ -4052,7 +3892,7 @@
    "referenced_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "self_type" : "_ZTI25$GRALLOC_USAGE_ALLOC_MASK",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h",
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4244,7 +4084,7 @@
      "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_FRONT_BUFFER"
     },
     {
@@ -4260,71 +4100,71 @@
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
     },
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 281474976710656,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 562949953421312,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1125899906842624,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2251799813685248,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4503599627370496,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9007199254740992,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18014398509481984,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 36028797018963968,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 72057594037927936,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 144115188075855872,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 288230376151711744,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 576460752303423488,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 1152921504606846976,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 2305843009213693952,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4611686018427387904,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 9223372036854775808,
      "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
     }
    ],
@@ -4644,7 +4484,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::HW_IMAGE_ENCODER"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 4294967296,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::FRONT_BUFFER"
     },
     {
@@ -4652,7 +4492,7 @@
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : -281474976710656,
      "name" : "aidl::android::hardware::graphics::common::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -7414,7 +7254,7 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : -2147483648,
+     "enum_field_value" : 2147483648,
      "name" : "android::ui::Transform::UNKNOWN_TYPE"
     }
    ],
@@ -8396,11 +8236,11 @@
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_0::BufferUsage::VENDOR_MASK_HI"
     }
    ],
@@ -8987,11 +8827,11 @@
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_1::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -9572,11 +9412,11 @@
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::GPU_DATA_BUFFER"
     },
     {
-     "enum_field_value" : -268435456,
+     "enum_field_value" : 4026531840,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK"
     },
     {
-     "enum_field_value" : 0,
+     "enum_field_value" : 18446462598732840960,
      "name" : "android::hardware::graphics::common::V1_2::BufferUsage::VENDOR_MASK_HI"
     },
     {
@@ -10888,7 +10728,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -10906,7 +10746,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10939,7 +10779,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -10954,7 +10794,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10972,7 +10812,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -10990,7 +10830,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11017,7 +10857,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -11062,7 +10902,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -11080,7 +10920,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11101,7 +10941,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11125,7 +10965,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11161,7 +11001,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11200,7 +11040,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11236,7 +11076,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11275,7 +11115,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11308,7 +11148,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11326,7 +11166,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "return_type" : "_ZTIi",
    "self_type" : "_ZTIFiPK16gralloc_module_tizE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11362,7 +11202,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP14alloc_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -11383,7 +11223,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvP20framebuffer_device_tPciE",
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -14529,19 +14369,6 @@
    "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" :
@@ -14571,22 +14398,6 @@
    "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" :
@@ -14603,22 +14414,6 @@
    "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" :
@@ -16301,6 +16096,12 @@
    "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" :
@@ -22218,7 +22019,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTIP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22227,7 +22028,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIP11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22272,7 +22073,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTIP14alloc_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22308,7 +22109,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTIP19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22317,7 +22118,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTIP20framebuffer_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22407,7 +22208,7 @@
    "referenced_type" : "_ZTIFiP11hw_device_tE",
    "self_type" : "_ZTIPFiP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22416,7 +22217,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP14alloc_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22425,7 +22226,7 @@
    "referenced_type" : "_ZTIFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "self_type" : "_ZTIPFiP14alloc_device_tiiiiPPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22434,7 +22235,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22443,7 +22244,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tPK13native_handleE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22452,7 +22253,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22461,7 +22262,7 @@
    "referenced_type" : "_ZTIFiP20framebuffer_device_tiiiiE",
    "self_type" : "_ZTIPFiP20framebuffer_device_tiiiiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22479,7 +22280,7 @@
    "referenced_type" : "_ZTIFiPK11hw_module_tPKcPP11hw_device_tE",
    "self_type" : "_ZTIPFiPK11hw_module_tPKcPP11hw_device_tE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22488,7 +22289,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22497,7 +22298,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePiE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePiE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22506,7 +22307,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlePjS5_E",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22515,7 +22316,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcrE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22524,7 +22325,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiP13android_ycbcriE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22533,7 +22334,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPvE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22542,7 +22343,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handleiiiiiPPviE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22551,7 +22352,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tPK13native_handlejjiijE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tPK13native_handlejjiijE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22560,7 +22361,7 @@
    "referenced_type" : "_ZTIFiPK16gralloc_module_tizE",
    "self_type" : "_ZTIPFiPK16gralloc_module_tizE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22578,7 +22379,7 @@
    "referenced_type" : "_ZTIFvP14alloc_device_tPciE",
    "self_type" : "_ZTIPFvP14alloc_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -22587,7 +22388,7 @@
    "referenced_type" : "_ZTIFvP20framebuffer_device_tPciE",
    "self_type" : "_ZTIPFvP20framebuffer_device_tPciE",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
@@ -22614,7 +22415,7 @@
    "referenced_type" : "_ZTIK11hw_module_t",
    "self_type" : "_ZTIPK11hw_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -22641,7 +22442,7 @@
    "referenced_type" : "_ZTIK16gralloc_module_t",
    "self_type" : "_ZTIPK16gralloc_module_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -25566,7 +25367,7 @@
    "referenced_type" : "_ZTIP11hw_device_t",
    "self_type" : "_ZTIPP11hw_device_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25697,7 +25498,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTIK11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -25735,7 +25536,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTIK16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28272,7 +28073,7 @@
    "referenced_type" : "_ZTI11hw_device_t",
    "self_type" : "_ZTI11hw_device_t",
    "size" : 64,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28328,7 +28129,7 @@
    "referenced_type" : "_ZTI11hw_module_t",
    "self_type" : "_ZTI11hw_module_t",
    "size" : 128,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28492,7 +28293,7 @@
    "referenced_type" : "_ZTI14alloc_device_t",
    "self_type" : "_ZTI14alloc_device_t",
    "size" : 104,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28589,7 +28390,7 @@
    "referenced_type" : "_ZTI16gralloc_module_t",
    "self_type" : "_ZTI16gralloc_module_t",
    "size" : 176,
-   "source_file" : "hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/gralloc.h"
   },
   {
    "alignment" : 4,
@@ -28748,7 +28549,7 @@
    "referenced_type" : "_ZTI19hw_module_methods_t",
    "self_type" : "_ZTI19hw_module_methods_t",
    "size" : 4,
-   "source_file" : "hardware/libhardware/include/hardware/hardware.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/hardware.h"
   },
   {
    "alignment" : 4,
@@ -28936,7 +28737,7 @@
    "referenced_type" : "_ZTI20framebuffer_device_t",
    "self_type" : "_ZTI20framebuffer_device_t",
    "size" : 184,
-   "source_file" : "hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "hardware/libhardware/include_all/hardware/fb.h"
   },
   {
    "alignment" : 4,
diff --git a/34/64/x86_x86_64/source-based/libunwindstack.so.lsdump b/34/64/x86_x86_64/source-based/libunwindstack.so.lsdump
index 3c0d835..096baf4 100644
--- a/34/64/x86_x86_64/source-based/libunwindstack.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libunwindstack.so.lsdump
@@ -102,24 +102,6 @@
   },
   {
    "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" : 4,
-   "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" : 4,
    "linker_set_key" : "_ZTIA64_y",
    "name" : "unsigned long long[64]",
    "referenced_type" : "_ZTIy",
@@ -247,402 +229,369 @@
    "name" : "AsmGetRegs"
   },
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle12try_demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle12try_demangle"
   },
   {
-   "name" : "_RNvCs5OIsIcU3KsB_14rustc_demangle8demangle"
+   "name" : "_RNvCsc3gp0nclRww_14rustc_demangle8demangle"
   },
   {
-   "name" : "_RNvMNtNtCsgEvhZdlx7kS_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
+   "name" : "_RNvMNtCsigYXxsQj60g_4core4charNtB2_13EscapeUnicode3new"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk5valid"
+   "name" : "_RNvMNtNtCs51HVTe8mXkC_3std10sys_common16thread_local_keyNtB2_9StaticKey9lazy_init"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core3str5lossyNtB2_9Utf8Chunk7invalid"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk5valid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core3str5lossyNtB2_9Utf8Chunk7invalid"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7message"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo10can_unwind"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo7payload"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7message"
   },
   {
-   "name" : "_RNvMNtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB2_9PanicInfo8location"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo7payload"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
+   "name" : "_RNvMNtNtCsigYXxsQj60g_4core5panic10panic_infoNtB2_9PanicInfo8location"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks11futex_mutexNtB2_5Mutex14lock_contended"
   },
   {
-   "name" : "_RNvMNtNtNtNtCsgEvhZdlx7kS_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock14read_contended"
   },
   {
-   "name" : "_RNvMs0_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8Chunks3new"
+   "name" : "_RNvMNtNtNtNtCs51HVTe8mXkC_3std3sys4unix5locks12futex_rwlockNtB2_6RwLock22wake_writer_or_readers"
   },
   {
-   "name" : "_RNvMs1_NtCshYZxXgsOdMC_4core3fmtNtB5_10ArgumentV110from_usize"
+   "name" : "_RNvMs0_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8Chunks3new"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct5field"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct5field"
   },
   {
-   "name" : "_RNvMs1_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_11DebugStruct6finish"
+   "name" : "_RNvMs1_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_11DebugStruct6finish"
   },
   {
-   "name" : "_RNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB5_4CStr6to_str"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB5_4CStr6to_str"
   },
   {
-   "name" : "_RNvMs4_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_8DebugSet5entry"
+   "name" : "_RNvMs4_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_8DebugSet5entry"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList5entry"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter10debug_list"
   },
   {
-   "name" : "_RNvMs5_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_9DebugList6finish"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12debug_struct"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter10debug_list"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter12pad_integral"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12debug_struct"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_lower_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter12pad_integral"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter15debug_upper_hex"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_lower_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter3pad"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter15debug_upper_hex"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9alternate"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter3pad"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_fmt"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9alternate"
+   "name" : "_RNvMs5_NtCsigYXxsQj60g_4core3fmtNtB5_9Formatter9write_str"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_fmt"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList5entry"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3fmtNtB5_9Formatter9write_str"
+   "name" : "_RNvMs5_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_9DebugList6finish"
   },
   {
-   "name" : "_RNvMs7_NtCshYZxXgsOdMC_4core3numm14from_str_radix"
+   "name" : "_RNvMs6_NtCsigYXxsQj60g_4core3numm14from_str_radix"
   },
   {
-   "name" : "_RNvMs8_NtCsgEvhZdlx7kS_3std4pathNtB5_10Components7as_path"
+   "name" : "_RNvMs8_NtCs51HVTe8mXkC_3std4pathNtB5_10Components7as_path"
   },
   {
-   "name" : "_RNvMsZ_NtCsgEvhZdlx7kS_3std4pathNtB5_4Path13__strip_prefix"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug12from_unicode"
   },
   {
-   "name" : "_RNvMsr_NtNtCshYZxXgsOdMC_4core3str7patternNtB5_11StrSearcher3new"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug5clear"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc4sync32arcinner_layout_for_value_layout"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9backslash"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error"
+   "name" : "_RNvMs8_NtCsigYXxsQj60g_4core4charNtB5_11EscapeDebug9printable"
   },
   {
-   "name" : "_RNvNtCse8HI3UYfCwz_5alloc7raw_vec17capacity_overflow"
+   "name" : "_RNvMsZ_NtCs51HVTe8mXkC_3std4pathNtB5_4Path13__strip_prefix"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std3env11current_dir"
+   "name" : "_RNvMsr_NtNtCsigYXxsQj60g_4core3str7patternNtB5_11StrSearcher3new"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std5alloc8rust_oom"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std3env11current_dir"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std7process5abort"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std5alloc8rust_oom"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking12default_hook"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std7process5abort"
   },
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking20rust_panic_with_hook"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking12default_hook"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt17pointer_fmt_inner"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking20rust_panic_with_hook"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3fmt5write"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc4sync32arcinner_layout_for_value_layout"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str16slice_error_fail"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core3str19slice_error_fail_rt"
+   "name" : "_RNvNtCs8l6Tmkn1WCW_5alloc7raw_vec17capacity_overflow"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core6result13unwrap_failed"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt17pointer_fmt_inner"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking18panic_bounds_check"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3fmt5write"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking19assert_failed_inner"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str16slice_error_fail"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking5panic"
+   "name" : "_RNvNtCsigYXxsQj60g_4core3str19slice_error_fail_rt"
   },
   {
-   "name" : "_RNvNtCshYZxXgsOdMC_4core9panicking9panic_fmt"
+   "name" : "_RNvNtCsigYXxsQj60g_4core6result13unwrap_failed"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix14abort_internal"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking18panic_bounds_check"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std3sys4unix17decode_error_kind"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking19assert_failed_inner"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count17is_zero_slow_path"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking5panic"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count14do_count_chars"
+   "name" : "_RNvNtCsigYXxsQj60g_4core9panicking9panic_fmt"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str5count23char_count_general_case"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix14abort_internal"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str6traits23str_index_overflow_fail"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std3sys4unix17decode_error_kind"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core3str8converts9from_utf8"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count17is_zero_slow_path"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index22slice_index_order_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count14do_count_chars"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str5count23char_count_general_case"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str6traits23str_index_overflow_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index24slice_end_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3str8converts9from_utf8"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice5index26slice_start_index_len_fail"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index22slice_index_order_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core5slice6memchr14memchr_aligned"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index24slice_end_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtCshYZxXgsOdMC_4core7unicode9printable12is_printable"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice5index26slice_start_index_len_fail"
   },
   {
-   "name" : "_RNvNtNtNtCsgEvhZdlx7kS_3std3sys6common5alloc16realloc_fallback"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core5slice6memchr14memchr_aligned"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data15grapheme_extend6lookup"
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core7unicode9printable12is_printable"
   },
   {
-   "name" : "_RNvNtNtNtCshYZxXgsOdMC_4core7unicode12unicode_data2cc6lookup"
+   "name" : "_RNvNtNtNtCs51HVTe8mXkC_3std3sys6common5alloc16realloc_fallback"
   },
   {
-   "name" : "_RNvNvMs3_NtNtCshYZxXgsOdMC_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data15grapheme_extend6lookup"
   },
   {
-   "name" : "_RNvNvNtCse8HI3UYfCwz_5alloc5alloc18handle_alloc_error8rt_error"
+   "name" : "_RNvNtNtNtCsigYXxsQj60g_4core7unicode12unicode_data2cc6lookup"
   },
   {
-   "name" : "_RNvXNtCs5OIsIcU3KsB_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvMs4_NtNtCsigYXxsQj60g_4core3ffi5c_strNtB7_4CStr8from_ptr9strlen_rt"
   },
   {
-   "name" : "_RNvXNtCsjhy8uZQdWLM_14rustc_demangle6legacyNtB2_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvNvNtCs8l6Tmkn1WCW_5alloc5alloc18handle_alloc_error8rt_error"
   },
   {
-   "name" : "_RNvXNvNtNtCsgEvhZdlx7kS_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCs3jb9llYclZH_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCs5OIsIcU3KsB_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNtCsc3gp0nclRww_14rustc_demangle6legacyNtB2_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtCsjhy8uZQdWLM_14rustc_demangle2v0NtB5_5IdentNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXNvNtNtCs51HVTe8mXkC_3std10sys_common9backtrace6__printNtB2_16DisplayBacktraceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
+   "name" : "_RNvXs0_NtCs3jb9llYclZH_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NtNtCshYZxXgsOdMC_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
+   "name" : "_RNvXs0_NtCsc3gp0nclRww_14rustc_demangle2v0NtB5_5IdentNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core3fmt8buildersNtB5_10PadAdapterNtB7_5Write9write_str"
   },
   {
-   "name" : "_RNvXs0_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs0_NtNtCsigYXxsQj60g_4core5panic8locationNtB5_8LocationNtNtB9_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs10_NtNtCshYZxXgsOdMC_4core3fmt3numxNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs14_NtNtCshYZxXgsOdMC_4core3fmt3numyNtB8_8LowerHex3fmt"
+   "name" : "_RNvXs0_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB5_15StrPanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXs1_Cs5OIsIcU3KsB_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs10_NtNtCsigYXxsQj60g_4core3fmt3numxNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_Csjhy8uZQdWLM_14rustc_demangleNtB5_8DemangleNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs14_NtNtCsigYXxsQj60g_4core3fmt3numyNtB8_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtCshYZxXgsOdMC_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_Cs3jb9llYclZH_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs1_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StdoutNtNtBb_2io5Write5flush"
+   "name" : "_RNvXs1_Csc3gp0nclRww_14rustc_demangleNtB5_8DemangleNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs2_NtCshYZxXgsOdMC_4core4charNtB5_13EscapeDefaultNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs1_NtNtCsigYXxsQj60g_4core3str5lossyNtB5_10Utf8ChunksNtNtNtNtB9_4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXs2_NtNtNtCshYZxXgsOdMC_4core3fmt3num3implNtB9_7Display3fmt"
+   "name" : "_RNvXs2_NtNtNtCsigYXxsQj60g_4core3fmt3num3implNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtCsgEvhZdlx7kS_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs3_NtCsigYXxsQj60g_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
+   "name" : "_RNvXs3_NtNtCs51HVTe8mXkC_3std12backtrace_rs9symbolizeNtB5_10SymbolNameNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCsgEvhZdlx7kS_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write14write_vectored"
   },
   {
-   "name" : "_RNvXs3_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impmNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5flush"
   },
   {
-   "name" : "_RNvXs5_NtCshYZxXgsOdMC_4core3fmtNtB5_9ArgumentsNtB5_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCs51HVTe8mXkC_3std3sys4unix5stdioNtB5_6StderrNtNtBb_2io5Write5write"
   },
   {
-   "name" : "_RNvXs5_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impjNtB9_7Display3fmt"
+   "name" : "_RNvXs3_NtNtNtCsigYXxsQj60g_4core3fmt3num3impmNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXs6_NtCshYZxXgsOdMC_4core4charNtB5_11EscapeDebugNtNtNtNtB7_4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXs5_NtNtNtCsigYXxsQj60g_4core3fmt3num3impjNtB9_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" : "_RNvXs7_NtNtNtCshYZxXgsOdMC_4core3fmt3num3impyNtB9_7Display3fmt"
+   "name" : "_RNvXs7_Cs3jb9llYclZH_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write10write_char"
+   "name" : "_RNvXs7_Csc3gp0nclRww_14rustc_demangleNtB5_18SizeLimitExhaustedNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs8_NtCshYZxXgsOdMC_4core3fmtNtB5_9FormatterNtB5_5Write9write_str"
+   "name" : "_RNvXs7_NtNtNtCsigYXxsQj60g_4core3fmt3num3impyNtB9_7Display3fmt"
   },
   {
-   "name" : "_RNvXsC_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsC_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsD_NtNtCshYZxXgsOdMC_4core3fmt3numaNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsD_NtNtCsigYXxsQj60g_4core3fmt3numaNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsG_NtCshYZxXgsOdMC_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
+   "name" : "_RNvXsE_NtCsigYXxsQj60g_4core3fmtNtB5_5ErrorNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsG_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsG_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsH_NtNtCshYZxXgsOdMC_4core3fmt3numhNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsH_NtNtCsigYXxsQj60g_4core3fmt3numhNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXsS_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8LowerHex3fmt"
+   "name" : "_RNvXsS_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8LowerHex3fmt"
   },
   {
-   "name" : "_RNvXsT_NtNtCshYZxXgsOdMC_4core3fmt3numlNtB7_8UpperHex3fmt"
+   "name" : "_RNvXsT_NtNtCsigYXxsQj60g_4core3fmt3numlNtB7_8UpperHex3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCsgEvhZdlx7kS_3std6thread5localNtB4_11AccessErrorNtNtCshYZxXgsOdMC_4core3fmt5Debug3fmt"
+   "name" : "_RNvXs_NtNtCs51HVTe8mXkC_3std6thread5localNtB4_11AccessErrorNtNtCsigYXxsQj60g_4core3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtCshYZxXgsOdMC_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtCsigYXxsQj60g_4core5panic10panic_infoNtB4_9PanicInfoNtNtB8_3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCsgEvhZdlx7kS_3std3sys4unix6os_strNtB4_5SliceNtNtCshYZxXgsOdMC_4core3fmt7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCs51HVTe8mXkC_3std3sys4unix6os_strNtB4_5SliceNtNtCsigYXxsQj60g_4core3fmt7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NtNtNtCshYZxXgsOdMC_4core3fmt3num3imphNtB8_7Display3fmt"
+   "name" : "_RNvXs_NtNtNtCsigYXxsQj60g_4core3fmt3num3imphNtB8_7Display3fmt"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp3get"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp3get"
   },
   {
-   "name" : "_RNvXs_NvNtCsgEvhZdlx7kS_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCshYZxXgsOdMC_4core5panic7BoxMeUp8take_box"
+   "name" : "_RNvXs_NvNtCs51HVTe8mXkC_3std9panicking19begin_panic_handlerNtB4_12PanicPayloadNtNtCsigYXxsQj60g_4core5panic7BoxMeUp8take_box"
   },
   {
-   "name" : "_RNvXsd_NtNtCshYZxXgsOdMC_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsc_NtCsigYXxsQj60g_4core3fmteNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtCshYZxXgsOdMC_4core3fmteNtB5_5Debug3fmt"
+   "name" : "_RNvXsc_NtNtCsigYXxsQj60g_4core3num5errorNtB5_13ParseIntErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXse_NtNtCshYZxXgsOdMC_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
+   "name" : "_RNvXsd_NtCsigYXxsQj60g_4core3fmteNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsf_NtCshYZxXgsOdMC_4core3fmteNtB5_7Display3fmt"
+   "name" : "_RNvXse_NtCsigYXxsQj60g_4core3fmtcNtB5_5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core3fmtcNtB5_5Debug3fmt"
+   "name" : "_RNvXse_NtNtCsigYXxsQj60g_4core5alloc6layoutNtB5_11LayoutErrorNtNtB9_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsg_NtCshYZxXgsOdMC_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
+   "name" : "_RNvXsf_NtCsigYXxsQj60g_4core3fmtcNtB5_7Display3fmt"
   },
   {
-   "name" : "_RNvXsh_NtCshYZxXgsOdMC_4core3fmtcNtB5_7Display3fmt"
+   "name" : "_RNvXsh_NtCsigYXxsQj60g_4core4cellNtB5_14BorrowMutErrorNtNtB7_3fmt5Debug3fmt"
   },
   {
-   "name" : "_RNvXsi_NtCsgEvhZdlx7kS_3std4pathNtB5_10ComponentsNtNtNtNtCshYZxXgsOdMC_4core4iter6traits8iterator8Iterator4next"
+   "name" : "_RNvXsi_NtCs51HVTe8mXkC_3std4pathNtB5_10ComponentsNtNtNtNtCsigYXxsQj60g_4core4iter6traits8iterator8Iterator4next"
   },
   {
-   "name" : "_RNvXsp_NtCshYZxXgsOdMC_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
+   "name" : "_RNvXso_NtCsigYXxsQj60g_4core3numjNtNtNtB7_3str6traits7FromStr8from_str"
   },
   {
    "name" : "_ZN11unwindstack10BufferMaps5ParseEv"
   },
   {
-   "name" : "_ZN11unwindstack10RegsMips6416IterateRegistersENSt3__18functionIFvPKcyEEE"
-  },
-  {
-   "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"
   },
   {
@@ -2531,45 +2480,6 @@
    "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"
   },
   {
@@ -3306,10 +3216,13 @@
  "elf_objects" :
  [
   {
-   "name" : "_RNvNtCsgEvhZdlx7kS_3std9panicking4HOOK"
+   "name" : "_RNvNtCs51HVTe8mXkC_3std9panicking4HOOK"
   },
   {
-   "name" : "_RNvNtNtCsgEvhZdlx7kS_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+   "name" : "_RNvNtNtCs51HVTe8mXkC_3std9panicking11panic_count18GLOBAL_PANIC_COUNT"
+  },
+  {
+   "name" : "_RNvNtNtCsigYXxsQj60g_4core3fmt2rt12USIZE_MARKER"
   },
   {
    "binding" : "weak",
@@ -3378,9 +3291,6 @@
    "name" : "_ZTVN11unwindstack10BufferMapsE"
   },
   {
-   "name" : "_ZTVN11unwindstack10RegsMips64E"
-  },
-  {
    "name" : "_ZTVN11unwindstack10RegsX86_64E"
   },
   {
@@ -3572,9 +3482,6 @@
    "name" : "_ZTVN11unwindstack8RegsImplIyEE"
   },
   {
-   "name" : "_ZTVN11unwindstack8RegsMipsE"
-  },
-  {
    "name" : "_ZTVN11unwindstack8UnwinderE"
   },
   {
@@ -3638,6 +3545,9 @@
   },
   {
    "name" : "__rust_alloc_error_handler_should_panic"
+  },
+  {
+   "name" : "__rust_no_alloc_shim_is_unstable"
   }
  ],
  "enum_types" :
@@ -3809,48 +3719,6 @@
    "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" :
    [
@@ -4181,163 +4049,6 @@
    "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" :
    [
@@ -4363,14 +4074,6 @@
     },
     {
      "enum_field_value" : 5,
-     "name" : "unwindstack::ARCH_MIPS"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "unwindstack::ARCH_MIPS64"
-    },
-    {
-     "enum_field_value" : 7,
      "name" : "unwindstack::ARCH_RISCV64"
     }
    ],
@@ -4638,163 +4341,6 @@
    [
     {
      "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"
     },
     {
@@ -4900,194 +4446,6 @@
    "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" :
@@ -7819,194 +7177,6 @@
    "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",
@@ -8939,15 +8109,6 @@
   },
   {
    "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",
@@ -9308,15 +8469,6 @@
   },
   {
    "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",
@@ -9833,82 +8985,6 @@
      "referenced_type" : "_ZTIN11unwindstack8RegsImplIyEE"
     }
    ],
-   "linker_set_key" : "_ZTIN11unwindstack10RegsMips64E",
-   "name" : "unwindstack::RegsMips64",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN11unwindstack10RegsMips64E",
-   "self_type" : "_ZTIN11unwindstack10RegsMips64E",
-   "size" : 32,
-   "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" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTIN11unwindstack8RegsImplIyEE"
-    }
-   ],
    "linker_set_key" : "_ZTIN11unwindstack10RegsX86_64E",
    "name" : "unwindstack::RegsX86_64",
    "record_kind" : "class",
@@ -10636,32 +9712,6 @@
    "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" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "type",
      "referenced_type" : "_ZTIN11unwindstack17DwarfLocationEnumE"
     },
@@ -11004,48 +10054,6 @@
      "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" : 20,
-   "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" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "ss_sp",
-     "referenced_type" : "_ZTIy"
-    },
-    {
      "field_name" : "ss_flags",
      "field_offset" : 64,
      "referenced_type" : "_ZTIi"
@@ -11439,68 +10447,6 @@
   },
   {
    "alignment" : 4,
-   "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" : 4,
-   "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" : 160,
-     "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" : 292,
-   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips.h"
-  },
-  {
-   "alignment" : 4,
    "base_specifiers" :
    [
     {
@@ -11903,22 +10849,6 @@
    "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" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "sig",
      "referenced_type" : "_ZTIy"
     }
@@ -12081,103 +11011,6 @@
    "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" : 4,
-   "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" : 288,
-     "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" : 620,
-   "source_file" : "system/unwinding/libunwindstack/include/unwindstack/UcontextMips64.h"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "regs",
      "referenced_type" : "_ZTIA32_y"
     }
@@ -13761,82 +12594,6 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "_ZTIN11unwindstack8RegsImplIjEE"
-    }
-   ],
-   "linker_set_key" : "_ZTIN11unwindstack8RegsMipsE",
-   "name" : "unwindstack::RegsMips",
-   "record_kind" : "class",
-   "referenced_type" : "_ZTIN11unwindstack8RegsMipsE",
-   "self_type" : "_ZTIN11unwindstack8RegsMipsE",
-   "size" : 32,
-   "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" : 4,
    "fields" :
    [
     {
diff --git a/34/64/x86_x86_64/source-based/libutils.so.lsdump b/34/64/x86_x86_64/source-based/libutils.so.lsdump
index 9f63b0c..808b3ac 100644
--- a/34/64/x86_x86_64/source-based/libutils.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libutils.so.lsdump
@@ -492,10 +492,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android2spINS_14LooperCallbackEE5clearEv"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android2spINS_20SimpleLooperCallbackEEaSEOS2_"
   },
   {
@@ -507,10 +503,6 @@
    "name" : "_ZN7android2spINS_6ThreadEE5clearEv"
   },
   {
-   "binding" : "weak",
-   "name" : "_ZN7android2spINS_6ThreadEEaSEOS2_"
-  },
-  {
    "name" : "_ZN7android30get_report_sysprop_change_funcEv"
   },
   {
@@ -745,9 +737,6 @@
    "name" : "_ZN7android7String813appendFormatVEPKcPc"
   },
   {
-   "name" : "_ZN7android7String816convertToResPathEv"
-  },
-  {
    "name" : "_ZN7android7String85clearEv"
   },
   {
@@ -1226,10 +1215,6 @@
   },
   {
    "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_"
   },
   {
@@ -1254,10 +1239,6 @@
   },
   {
    "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_"
   },
   {
@@ -1270,10 +1251,6 @@
   },
   {
    "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"
   },
   {
@@ -5763,19 +5740,6 @@
    "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" :
@@ -5821,22 +5785,6 @@
    "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" :
@@ -7067,19 +7015,6 @@
    "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/x86_x86_64/source-based/libxml2.so.lsdump b/34/64/x86_x86_64/source-based/libxml2.so.lsdump
index 243219c..c4eaf14 100644
--- a/34/64/x86_x86_64/source-based/libxml2.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libxml2.so.lsdump
@@ -718,6 +718,9 @@
    "name" : "xmlCtxtResetPush"
   },
   {
+   "name" : "xmlCtxtSetMaxAmplification"
+  },
+  {
    "name" : "xmlCtxtUseOptions"
   },
   {
@@ -1402,6 +1405,9 @@
    "name" : "xmlMemShow"
   },
   {
+   "name" : "xmlMemSize"
+  },
+  {
    "name" : "xmlMemStrdupLoc"
   },
   {
@@ -1915,6 +1921,9 @@
    "name" : "xmlParserInputBufferCreateStatic"
   },
   {
+   "name" : "xmlParserInputBufferCreateString"
+  },
+  {
    "name" : "xmlParserInputBufferGrow"
   },
   {
@@ -3001,6 +3010,9 @@
    "name" : "xmlTextReaderSetErrorHandler"
   },
   {
+   "name" : "xmlTextReaderSetMaxAmplification"
+  },
+  {
    "name" : "xmlTextReaderSetParserProp"
   },
   {
@@ -5389,6 +5401,43 @@
    "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"
     },
@@ -5971,6 +6020,10 @@
      "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"
     },
@@ -9490,6 +9543,10 @@
     {
      "enum_field_value" : 16,
      "name" : "XML_PARSER_PUBLIC_LITERAL"
+    },
+    {
+     "enum_field_value" : 17,
+     "name" : "XML_PARSER_XML_DECL"
     }
    ],
    "linker_set_key" : "_ZTI19xmlParserInputState",
@@ -13970,6 +14027,21 @@
    "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" :
@@ -17219,6 +17291,18 @@
    "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" :
@@ -19742,6 +19826,18 @@
    "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" :
@@ -22618,7 +22714,7 @@
   {
    "function_name" : "xmlSchemaInitTypes",
    "linker_set_key" : "xmlSchemaInitTypes",
-   "return_type" : "_ZTIv",
+   "return_type" : "_ZTIi",
    "source_file" : "external/libxml2/include/libxml/xmlschemastypes.h"
   },
   {
@@ -25406,6 +25502,21 @@
    "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" :
@@ -35289,13 +35400,18 @@
      "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" : 480,
+   "size" : 484,
    "source_file" : "external/libxml2/include/libxml/parser.h"
   },
   {
@@ -35979,7 +36095,7 @@
      "referenced_type" : "_ZTIPKh"
     },
     {
-     "field_name" : "standalone",
+     "field_name" : "flags",
      "field_offset" : 416,
      "referenced_type" : "_ZTIi"
     },
diff --git a/34/64/x86_x86_64/source-based/libyuv.so.lsdump b/34/64/x86_x86_64/source-based/libyuv.so.lsdump
index 37f583d..63d0417 100644
--- a/34/64/x86_x86_64/source-based/libyuv.so.lsdump
+++ b/34/64/x86_x86_64/source-based/libyuv.so.lsdump
@@ -8,7 +8,7 @@
    "referenced_type" : "_ZTIs",
    "self_type" : "_ZTIA16_s",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -17,7 +17,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIA256_j",
    "size" : 1024,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 1,
@@ -26,7 +26,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIA32_h",
    "size" : 32,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   }
  ],
  "builtin_types" :
@@ -175,12 +175,36 @@
    "name" : "ABGRToI420"
   },
   {
+   "name" : "ABGRToJ400"
+  },
+  {
+   "name" : "ABGRToJ420"
+  },
+  {
+   "name" : "ABGRToJ422"
+  },
+  {
    "name" : "ABGRToNV12"
   },
   {
    "name" : "ABGRToNV21"
   },
   {
+   "name" : "ABGRToUVJRow_AVX2"
+  },
+  {
+   "name" : "ABGRToUVJRow_Any_AVX2"
+  },
+  {
+   "name" : "ABGRToUVJRow_Any_SSSE3"
+  },
+  {
+   "name" : "ABGRToUVJRow_C"
+  },
+  {
+   "name" : "ABGRToUVJRow_SSSE3"
+  },
+  {
    "name" : "ABGRToUVRow_AVX2"
   },
   {
@@ -196,6 +220,21 @@
    "name" : "ABGRToUVRow_SSSE3"
   },
   {
+   "name" : "ABGRToYJRow_AVX2"
+  },
+  {
+   "name" : "ABGRToYJRow_Any_AVX2"
+  },
+  {
+   "name" : "ABGRToYJRow_Any_SSSE3"
+  },
+  {
+   "name" : "ABGRToYJRow_C"
+  },
+  {
+   "name" : "ABGRToYJRow_SSSE3"
+  },
+  {
    "name" : "ABGRToYRow_AVX2"
   },
   {
@@ -685,6 +724,9 @@
    "name" : "ARGBToI420"
   },
   {
+   "name" : "ARGBToI420Alpha"
+  },
+  {
    "name" : "ARGBToI422"
   },
   {
@@ -1072,6 +1114,24 @@
    "name" : "DetilePlane"
   },
   {
+   "name" : "DetilePlane_16"
+  },
+  {
+   "name" : "DetileRow_16_AVX"
+  },
+  {
+   "name" : "DetileRow_16_Any_AVX"
+  },
+  {
+   "name" : "DetileRow_16_Any_SSE2"
+  },
+  {
+   "name" : "DetileRow_16_C"
+  },
+  {
+   "name" : "DetileRow_16_SSE2"
+  },
+  {
    "name" : "DetileRow_Any_SSE2"
   },
   {
@@ -1093,6 +1153,18 @@
    "name" : "DetileSplitUVRow_SSSE3"
   },
   {
+   "name" : "DetileToYUY2"
+  },
+  {
+   "name" : "DetileToYUY2_Any_SSE2"
+  },
+  {
+   "name" : "DetileToYUY2_C"
+  },
+  {
+   "name" : "DetileToYUY2_SSE2"
+  },
+  {
    "name" : "DivideRow_16_AVX2"
   },
   {
@@ -1132,9 +1204,6 @@
    "name" : "GetARGBBlend"
   },
   {
-   "name" : "GetXCR0"
-  },
-  {
    "name" : "H010ToAB30"
   },
   {
@@ -1252,6 +1321,9 @@
    "name" : "I010Copy"
   },
   {
+   "name" : "I010Rotate"
+  },
+  {
    "name" : "I010ToAB30"
   },
   {
@@ -1309,6 +1381,9 @@
    "name" : "I210Copy"
   },
   {
+   "name" : "I210Rotate"
+  },
+  {
    "name" : "I210ToAB30"
   },
   {
@@ -1408,6 +1483,9 @@
    "name" : "I212ToARGBRow_SSSE3"
   },
   {
+   "name" : "I212ToI420"
+  },
+  {
    "name" : "I212ToI422"
   },
   {
@@ -1456,6 +1534,12 @@
    "name" : "I410AlphaToARGBRow_C"
   },
   {
+   "name" : "I410Copy"
+  },
+  {
+   "name" : "I410Rotate"
+  },
+  {
    "name" : "I410ToAR30Matrix"
   },
   {
@@ -1495,9 +1579,15 @@
    "name" : "I410ToI010"
   },
   {
+   "name" : "I410ToI420"
+  },
+  {
    "name" : "I410ToI444"
   },
   {
+   "name" : "I412ToI420"
+  },
+  {
    "name" : "I412ToI444"
   },
   {
@@ -1606,6 +1696,9 @@
    "name" : "I420ToRGB24Matrix"
   },
   {
+   "name" : "I420ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I420ToRGB565"
   },
   {
@@ -1756,6 +1849,18 @@
    "name" : "I422ToNV21"
   },
   {
+   "name" : "I422ToRAW"
+  },
+  {
+   "name" : "I422ToRGB24"
+  },
+  {
+   "name" : "I422ToRGB24Matrix"
+  },
+  {
+   "name" : "I422ToRGB24MatrixFilter"
+  },
+  {
    "name" : "I422ToRGB24Row_AVX2"
   },
   {
@@ -1774,6 +1879,9 @@
    "name" : "I422ToRGB565"
   },
   {
+   "name" : "I422ToRGB565Matrix"
+  },
+  {
    "name" : "I422ToRGB565Row_AVX2"
   },
   {
@@ -1918,6 +2026,30 @@
    "name" : "I444ToNV21"
   },
   {
+   "name" : "I444ToRAW"
+  },
+  {
+   "name" : "I444ToRGB24"
+  },
+  {
+   "name" : "I444ToRGB24Matrix"
+  },
+  {
+   "name" : "I444ToRGB24Row_AVX2"
+  },
+  {
+   "name" : "I444ToRGB24Row_Any_AVX2"
+  },
+  {
+   "name" : "I444ToRGB24Row_Any_SSSE3"
+  },
+  {
+   "name" : "I444ToRGB24Row_C"
+  },
+  {
+   "name" : "I444ToRGB24Row_SSSE3"
+  },
+  {
    "name" : "InitCpuFlags"
   },
   {
@@ -2014,6 +2146,12 @@
    "name" : "MM21ToNV12"
   },
   {
+   "name" : "MM21ToYUY2"
+  },
+  {
+   "name" : "MT2TToP010"
+  },
+  {
    "name" : "MaskCpuFlags"
   },
   {
@@ -2044,12 +2182,6 @@
    "name" : "MergeARGBPlane"
   },
   {
-   "name" : "MergeARGBPlaneAlpha"
-  },
-  {
-   "name" : "MergeARGBPlaneOpaque"
-  },
-  {
    "name" : "MergeARGBRow_AVX2"
   },
   {
@@ -2095,9 +2227,15 @@
    "name" : "MergeUVRow_AVX2"
   },
   {
+   "name" : "MergeUVRow_AVX512BW"
+  },
+  {
    "name" : "MergeUVRow_Any_AVX2"
   },
   {
+   "name" : "MergeUVRow_Any_AVX512BW"
+  },
+  {
    "name" : "MergeUVRow_Any_SSE2"
   },
   {
@@ -2158,6 +2296,9 @@
    "name" : "MirrorPlane"
   },
   {
+   "name" : "MirrorRow_16_C"
+  },
+  {
    "name" : "MirrorRow_AVX2"
   },
   {
@@ -2383,9 +2524,15 @@
    "name" : "P010ToARGBMatrixFilter"
   },
   {
+   "name" : "P010ToI010"
+  },
+  {
    "name" : "P010ToP410"
   },
   {
+   "name" : "P012ToI012"
+  },
+  {
    "name" : "P210ToAR30Matrix"
   },
   {
@@ -2671,6 +2818,9 @@
    "name" : "RGBScale"
   },
   {
+   "name" : "RiscvCpuCaps"
+  },
+  {
    "name" : "RotatePlane"
   },
   {
@@ -2683,6 +2833,9 @@
    "name" : "RotatePlane90"
   },
   {
+   "name" : "RotatePlane_16"
+  },
+  {
    "name" : "Scale"
   },
   {
@@ -2824,6 +2977,9 @@
    "name" : "ScalePlaneBilinearUp_16"
   },
   {
+   "name" : "ScalePlaneDown2_16To8"
+  },
+  {
    "name" : "ScalePlaneUp2_12_Bilinear"
   },
   {
@@ -2857,6 +3013,12 @@
    "name" : "ScalePlane_16"
   },
   {
+   "name" : "ScaleRowDown2Box_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Box_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Box_16_C"
   },
   {
@@ -2884,6 +3046,12 @@
    "name" : "ScaleRowDown2Box_SSSE3"
   },
   {
+   "name" : "ScaleRowDown2Linear_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2Linear_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2Linear_16_C"
   },
   {
@@ -2902,6 +3070,12 @@
    "name" : "ScaleRowDown2Linear_SSSE3"
   },
   {
+   "name" : "ScaleRowDown2_16To8_C"
+  },
+  {
+   "name" : "ScaleRowDown2_16To8_Odd_C"
+  },
+  {
    "name" : "ScaleRowDown2_16_C"
   },
   {
@@ -3331,12 +3505,6 @@
    "name" : "SplitARGBPlane"
   },
   {
-   "name" : "SplitARGBPlaneAlpha"
-  },
-  {
-   "name" : "SplitARGBPlaneOpaque"
-  },
-  {
    "name" : "SplitARGBRow_AVX2"
   },
   {
@@ -3463,15 +3631,33 @@
    "name" : "SwapUVRow_SSSE3"
   },
   {
+   "name" : "Transpose4x4_32_AVX2"
+  },
+  {
+   "name" : "Transpose4x4_32_C"
+  },
+  {
+   "name" : "Transpose4x4_32_SSE2"
+  },
+  {
    "name" : "TransposePlane"
   },
   {
+   "name" : "TransposePlane_16"
+  },
+  {
+   "name" : "TransposeUVWx8_16_C"
+  },
+  {
    "name" : "TransposeUVWx8_C"
   },
   {
    "name" : "TransposeUVWxH_C"
   },
   {
+   "name" : "TransposeWx8_16_C"
+  },
+  {
    "name" : "TransposeWx8_Any_SSSE3"
   },
   {
@@ -3481,6 +3667,9 @@
    "name" : "TransposeWx8_SSSE3"
   },
   {
+   "name" : "TransposeWxH_16_C"
+  },
+  {
    "name" : "TransposeWxH_C"
   },
   {
@@ -3607,6 +3796,9 @@
    "name" : "UYVYToYRow_SSE2"
   },
   {
+   "name" : "UnpackMT2T_C"
+  },
+  {
    "name" : "ValidateJpeg"
   },
   {
@@ -3640,6 +3832,21 @@
    "name" : "YUY2ToNV12"
   },
   {
+   "name" : "YUY2ToNVUVRow_AVX2"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_Any_AVX2"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_Any_SSE2"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_C"
+  },
+  {
+   "name" : "YUY2ToNVUVRow_SSE2"
+  },
+  {
    "name" : "YUY2ToUV422Row_AVX2"
   },
   {
@@ -3881,7 +4088,7 @@
    "referenced_type" : "_ZTIN6libyuv10FilterModeE",
    "self_type" : "_ZTIN6libyuv10FilterModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h",
+   "source_file" : "external/libyuv/include/libyuv/scale.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3922,7 +4129,7 @@
    "referenced_type" : "_ZTIN6libyuv12RotationModeE",
    "self_type" : "_ZTIN6libyuv12RotationModeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h",
+   "source_file" : "external/libyuv/include/libyuv/rotate.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -3955,7 +4162,7 @@
    "referenced_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "self_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h",
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h",
    "underlying_type" : "_ZTIj"
   },
   {
@@ -4268,7 +4475,7 @@
    "referenced_type" : "_ZTIN6libyuv6FourCCE",
    "self_type" : "_ZTIN6libyuv6FourCCE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIi"
   },
   {
@@ -4517,7 +4724,7 @@
    "referenced_type" : "_ZTIN6libyuv9FourCCBppE",
    "self_type" : "_ZTIN6libyuv9FourCCBppE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h",
+   "source_file" : "external/libyuv/include/libyuv/video_common.h",
    "underlying_type" : "_ZTIj"
   }
  ],
@@ -4545,7 +4752,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -4569,7 +4776,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "return_type" : "_ZTIv",
    "self_type" : "_ZTIFvPvPKPKhPKiiE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "functions" :
@@ -4599,7 +4806,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_AVX2",
@@ -4617,7 +4824,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_AVX2",
@@ -4635,7 +4842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_Any_SSSE3",
@@ -4653,7 +4860,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_C",
@@ -4671,7 +4878,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AB64ToARGBRow_SSSE3",
@@ -4689,7 +4896,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30",
@@ -4716,7 +4923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_AVX2",
@@ -4734,7 +4941,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_AVX2",
@@ -4752,7 +4959,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_Any_SSSE3",
@@ -4770,7 +4977,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_C",
@@ -4788,7 +4995,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToAR30Row_SSSE3",
@@ -4806,7 +5013,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToARGB",
@@ -4833,7 +5040,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToI420",
@@ -4872,7 +5079,112 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ABGRToNV12",
@@ -4905,7 +5217,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ABGRToNV21",
@@ -4938,7 +5250,127 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
+  },
+  {
+   "function_name" : "libyuv::ABGRToUVJRow_AVX2",
+   "linker_set_key" : "ABGRToUVJRow_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "ABGRToUVJRow_Any_AVX2",
+   "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_Any_SSSE3",
+   "linker_set_key" : "ABGRToUVJRow_Any_SSSE3",
+   "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_SSSE3",
+   "linker_set_key" : "ABGRToUVJRow_SSSE3",
+   "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::ABGRToUVRow_AVX2",
@@ -4962,7 +5394,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_AVX2",
@@ -4986,7 +5418,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_Any_SSSE3",
@@ -5010,7 +5442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_C",
@@ -5034,7 +5466,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToUVRow_SSSE3",
@@ -5058,7 +5490,97 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::ABGRToYJRow_AVX2",
+   "linker_set_key" : "ABGRToYJRow_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "ABGRToYJRow_Any_AVX2",
+   "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_Any_SSSE3",
+   "linker_set_key" : "ABGRToYJRow_Any_SSSE3",
+   "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_SSSE3",
+   "linker_set_key" : "ABGRToYJRow_SSSE3",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_AVX2",
@@ -5076,7 +5598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_AVX2",
@@ -5094,7 +5616,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_Any_SSSE3",
@@ -5112,7 +5634,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_C",
@@ -5130,7 +5652,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ABGRToYRow_SSSE3",
@@ -5148,7 +5670,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30",
@@ -5175,7 +5697,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToAB30Row_C",
@@ -5193,7 +5715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGR",
@@ -5220,7 +5742,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToABGRRow_C",
@@ -5238,7 +5760,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGB",
@@ -5265,7 +5787,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR30ToARGBRow_C",
@@ -5283,7 +5805,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64Shuffle",
@@ -5313,7 +5835,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::AR64ShuffleRow_C",
@@ -5334,7 +5856,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToAB64",
@@ -5361,7 +5883,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGB",
@@ -5388,7 +5910,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_AVX2",
@@ -5406,7 +5928,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_AVX2",
@@ -5424,7 +5946,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_Any_SSSE3",
@@ -5442,7 +5964,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_C",
@@ -5460,7 +5982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AR64ToARGBRow_SSSE3",
@@ -5478,7 +6000,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGB",
@@ -5505,7 +6027,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_Any_SSE2",
@@ -5523,7 +6045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_C",
@@ -5541,7 +6063,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToARGBRow_SSE2",
@@ -5559,7 +6081,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToI420",
@@ -5598,7 +6120,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToUVRow_C",
@@ -5622,7 +6144,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB1555ToYRow_C",
@@ -5640,7 +6162,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGB",
@@ -5667,7 +6189,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_Any_SSE2",
@@ -5685,7 +6207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_C",
@@ -5703,7 +6225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToARGBRow_SSE2",
@@ -5721,7 +6243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToI420",
@@ -5760,7 +6282,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToUVRow_C",
@@ -5784,7 +6306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGB4444ToYRow_C",
@@ -5802,7 +6324,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAdd",
@@ -5835,7 +6357,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_AVX2",
@@ -5856,7 +6378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_AVX2",
@@ -5877,7 +6399,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_Any_SSE2",
@@ -5898,7 +6420,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_C",
@@ -5919,7 +6441,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAddRow_SSE2",
@@ -5940,7 +6462,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_C",
@@ -5964,7 +6486,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAffineRow_SSE2",
@@ -5988,7 +6510,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuate",
@@ -6015,7 +6537,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_AVX2",
@@ -6033,7 +6555,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_AVX2",
@@ -6051,7 +6573,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_Any_SSSE3",
@@ -6069,7 +6591,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_C",
@@ -6087,7 +6609,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBAttenuateRow_SSSE3",
@@ -6105,7 +6627,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlend",
@@ -6138,7 +6660,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_C",
@@ -6159,7 +6681,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlendRow_SSSE3",
@@ -6180,7 +6702,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBBlur",
@@ -6216,7 +6738,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrix",
@@ -6246,7 +6768,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_C",
@@ -6267,7 +6789,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorMatrixRow_SSSE3",
@@ -6288,7 +6810,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTable",
@@ -6318,7 +6840,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_C",
@@ -6336,7 +6858,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBColorTableRow_X86",
@@ -6354,7 +6876,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBComputeCumulativeSum",
@@ -6381,7 +6903,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopy",
@@ -6408,7 +6930,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlpha",
@@ -6435,7 +6957,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_AVX2",
@@ -6453,7 +6975,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_AVX2",
@@ -6471,7 +6993,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_Any_SSE2",
@@ -6489,7 +7011,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_C",
@@ -6507,7 +7029,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyAlphaRow_SSE2",
@@ -6525,7 +7047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlpha",
@@ -6552,7 +7074,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_AVX2",
@@ -6570,7 +7092,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_AVX2",
@@ -6588,7 +7110,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_Any_SSE2",
@@ -6606,7 +7128,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_C",
@@ -6624,7 +7146,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBCopyYToAlphaRow_SSE2",
@@ -6642,7 +7164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBDetect",
@@ -6663,7 +7185,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlpha",
@@ -6690,7 +7212,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_AVX2",
@@ -6708,7 +7230,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_AVX2",
@@ -6726,7 +7248,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_Any_SSE2",
@@ -6744,7 +7266,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_C",
@@ -6762,7 +7284,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBExtractAlphaRow_SSE2",
@@ -6780,7 +7302,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGray",
@@ -6807,7 +7329,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_C",
@@ -6825,7 +7347,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayRow_SSSE3",
@@ -6843,7 +7365,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBGrayTo",
@@ -6870,7 +7392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBInterpolate",
@@ -6906,7 +7428,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTable",
@@ -6936,7 +7458,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_C",
@@ -6960,7 +7482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBLumaColorTableRow_SSSE3",
@@ -6984,7 +7506,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirror",
@@ -7011,7 +7533,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_AVX2",
@@ -7029,7 +7551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_AVX2",
@@ -7047,7 +7569,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_Any_SSE2",
@@ -7065,7 +7587,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_C",
@@ -7083,7 +7605,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMirrorRow_SSE2",
@@ -7101,7 +7623,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiply",
@@ -7134,7 +7656,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_AVX2",
@@ -7155,7 +7677,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_AVX2",
@@ -7176,7 +7698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_Any_SSE2",
@@ -7197,7 +7719,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_C",
@@ -7218,7 +7740,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBMultiplyRow_SSE2",
@@ -7239,7 +7761,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomial",
@@ -7269,7 +7791,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_AVX2",
@@ -7290,7 +7812,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_C",
@@ -7311,7 +7833,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBPolynomialRow_SSE2",
@@ -7332,7 +7854,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantize",
@@ -7368,7 +7890,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_C",
@@ -7392,7 +7914,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBQuantizeRow_SSE2",
@@ -7416,7 +7938,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBRect",
@@ -7446,7 +7968,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBSepia",
@@ -7473,7 +8025,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_C",
@@ -7488,7 +8040,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSepiaRow_SSSE3",
@@ -7503,7 +8055,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_C",
@@ -7521,7 +8073,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSetRow_X86",
@@ -7539,7 +8091,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShade",
@@ -7569,7 +8121,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_C",
@@ -7590,7 +8142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShadeRow_SSE2",
@@ -7611,7 +8163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffle",
@@ -7641,7 +8193,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_AVX2",
@@ -7662,7 +8214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_AVX2",
@@ -7683,7 +8235,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_Any_SSSE3",
@@ -7704,7 +8256,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_C",
@@ -7725,7 +8277,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBShuffleRow_SSSE3",
@@ -7746,7 +8298,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSobel",
@@ -7773,7 +8325,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelToPlane",
@@ -7800,7 +8352,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSobelXY",
@@ -7827,7 +8379,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtract",
@@ -7860,7 +8412,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_AVX2",
@@ -7881,7 +8433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_AVX2",
@@ -7902,7 +8454,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_Any_SSE2",
@@ -7923,7 +8475,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_C",
@@ -7944,7 +8496,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBSubtractRow_SSE2",
@@ -7965,7 +8517,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64",
@@ -7992,7 +8544,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_AVX2",
@@ -8010,7 +8562,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_AVX2",
@@ -8028,7 +8580,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_Any_SSSE3",
@@ -8046,7 +8598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_C",
@@ -8064,7 +8616,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAB64Row_SSSE3",
@@ -8082,7 +8634,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToAR30",
@@ -8109,7 +8688,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_AVX2",
@@ -8127,7 +8706,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_AVX2",
@@ -8145,7 +8724,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_Any_SSSE3",
@@ -8163,7 +8742,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_C",
@@ -8181,7 +8760,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR30Row_SSSE3",
@@ -8199,7 +8778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64",
@@ -8226,7 +8805,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_AVX2",
@@ -8244,7 +8823,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_AVX2",
@@ -8262,7 +8841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_Any_SSSE3",
@@ -8280,7 +8859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_C",
@@ -8298,7 +8877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToAR64Row_SSSE3",
@@ -8316,7 +8895,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555",
@@ -8343,7 +8922,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_Any_SSE2",
@@ -8361,7 +8940,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_C",
@@ -8379,7 +8958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB1555Row_SSE2",
@@ -8397,7 +8976,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444",
@@ -8424,7 +9003,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_Any_SSE2",
@@ -8442,7 +9021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_C",
@@ -8460,7 +9039,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToARGB4444Row_SSE2",
@@ -8478,7 +9057,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI400",
@@ -8505,7 +9111,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI420",
@@ -8544,7 +9150,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ARGBToI422",
@@ -8583,7 +9234,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToI444",
@@ -8622,7 +9273,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ400",
@@ -8649,7 +9300,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ420",
@@ -8688,7 +9339,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToJ422",
@@ -8727,7 +9378,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV12",
@@ -8760,7 +9411,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToNV21",
@@ -8793,7 +9444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAW",
@@ -8820,7 +9471,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_AVX2",
@@ -8838,7 +9489,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_AVX2",
@@ -8856,7 +9507,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_Any_SSSE3",
@@ -8874,7 +9525,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_C",
@@ -8892,7 +9543,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRAWRow_SSSE3",
@@ -8910,7 +9561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24",
@@ -8937,7 +9588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX2",
@@ -8955,7 +9606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_AVX512VBMI",
@@ -8973,7 +9624,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX2",
@@ -8991,7 +9642,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_AVX512VBMI",
@@ -9009,7 +9660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_Any_SSSE3",
@@ -9027,7 +9678,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_C",
@@ -9045,7 +9696,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB24Row_SSSE3",
@@ -9063,7 +9714,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565",
@@ -9090,7 +9741,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Dither",
@@ -9120,7 +9771,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_AVX2",
@@ -9134,14 +9785,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_AVX2",
@@ -9162,7 +9813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_Any_SSE2",
@@ -9183,7 +9834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_C",
@@ -9197,14 +9848,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565DitherRow_SSE2",
@@ -9218,14 +9869,14 @@
      "referenced_type" : "_ZTIPh"
     },
     {
-     "referenced_type" : "_ZTIKj"
+     "referenced_type" : "_ZTIj"
     },
     {
      "referenced_type" : "_ZTIi"
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_Any_SSE2",
@@ -9243,7 +9894,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_C",
@@ -9261,7 +9912,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGB565Row_SSE2",
@@ -9279,7 +9930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToRGBA",
@@ -9306,7 +9957,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_Any_SSSE3",
@@ -9327,7 +9978,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_C",
@@ -9348,7 +9999,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUV444Row_SSSE3",
@@ -9369,7 +10020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_AVX2",
@@ -9393,7 +10044,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_AVX2",
@@ -9417,7 +10068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_Any_SSSE3",
@@ -9441,7 +10092,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_C",
@@ -9465,7 +10116,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVJRow_SSSE3",
@@ -9489,7 +10140,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_AVX2",
@@ -9513,7 +10164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_AVX2",
@@ -9537,7 +10188,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_Any_SSSE3",
@@ -9561,7 +10212,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_C",
@@ -9585,7 +10236,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUVRow_SSSE3",
@@ -9609,7 +10260,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToUYVY",
@@ -9636,7 +10287,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_AVX2",
@@ -9654,7 +10305,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_AVX2",
@@ -9672,7 +10323,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_Any_SSSE3",
@@ -9690,7 +10341,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_C",
@@ -9708,7 +10359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYJRow_SSSE3",
@@ -9726,7 +10377,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_AVX2",
@@ -9744,7 +10395,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_AVX2",
@@ -9762,7 +10413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_Any_SSSE3",
@@ -9780,7 +10431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_C",
@@ -9798,7 +10449,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYRow_SSSE3",
@@ -9816,7 +10467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBToYUY2",
@@ -9843,7 +10494,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuate",
@@ -9870,7 +10521,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_AVX2",
@@ -9888,7 +10539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_AVX2",
@@ -9906,7 +10557,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_Any_SSE2",
@@ -9924,7 +10575,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_C",
@@ -9942,7 +10593,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ARGBUnattenuateRow_SSE2",
@@ -9960,7 +10611,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV12",
@@ -9993,7 +10644,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToNV21",
@@ -10026,7 +10677,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::AYUVToUVRow_C",
@@ -10047,7 +10698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToVURow_C",
@@ -10068,7 +10719,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::AYUVToYRow_C",
@@ -10086,7 +10737,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Android420ToABGR",
@@ -10128,7 +10779,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGB",
@@ -10170,7 +10821,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToARGBMatrix",
@@ -10215,7 +10866,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420",
@@ -10269,7 +10920,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::Android420ToI420Rotate",
@@ -10326,7 +10977,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::ArmCpuCaps",
@@ -10338,7 +10989,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::BGRAToARGB",
@@ -10365,7 +11016,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::BGRAToI420",
@@ -10404,7 +11055,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_Any_SSSE3",
@@ -10428,7 +11079,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_C",
@@ -10452,7 +11103,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToUVRow_SSSE3",
@@ -10476,7 +11127,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_Any_SSSE3",
@@ -10494,7 +11145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_C",
@@ -10512,7 +11163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BGRAToYRow_SSSE3",
@@ -10530,7 +11181,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlane",
@@ -10569,7 +11220,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_AVX2",
@@ -10593,7 +11244,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_AVX2",
@@ -10617,7 +11268,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_Any_SSSE3",
@@ -10641,7 +11292,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_C",
@@ -10665,7 +11316,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::BlendPlaneRow_SSSE3",
@@ -10689,7 +11340,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ByteToFloat",
@@ -10710,7 +11361,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ByteToFloatRow_C",
@@ -10731,7 +11382,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CalcFramePsnr",
@@ -10758,7 +11409,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CalcFrameSsim",
@@ -10785,7 +11436,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::CanonicalFourCC",
@@ -10797,7 +11448,25 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/video_common.h"
+   "source_file" : "external/libyuv/include/libyuv/video_common.h"
+  },
+  {
+   "function_name" : "libyuv::ClampFloatToZero_SSE2",
+   "linker_set_key" : "ClampFloatToZero_SSE2",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKf"
+    },
+    {
+     "referenced_type" : "_ZTIPf"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_C",
@@ -10818,7 +11487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeCumulativeSumRow_SSE2",
@@ -10839,7 +11508,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ComputeHammingDistance",
@@ -10857,7 +11526,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareError",
@@ -10875,7 +11544,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::ComputeSumSquareErrorPlane",
@@ -10902,7 +11571,7 @@
     }
    ],
    "return_type" : "_ZTIy",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Plane",
@@ -10932,7 +11601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_AVX2",
@@ -10953,7 +11622,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_AVX2",
@@ -10974,7 +11643,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_Any_SSSE3",
@@ -10995,7 +11664,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_C",
@@ -11016,7 +11685,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert16To8Row_SSSE3",
@@ -11037,7 +11706,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Plane",
@@ -11067,7 +11736,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_AVX2",
@@ -11088,7 +11757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_AVX2",
@@ -11109,7 +11778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_Any_SSE2",
@@ -11130,7 +11799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_C",
@@ -11151,7 +11820,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::Convert8To16Row_SSE2",
@@ -11172,7 +11841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ConvertFromI420",
@@ -11214,7 +11883,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::ConvertToARGB",
@@ -11259,7 +11928,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::ConvertToI420",
@@ -11316,7 +11985,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::ConvertToLSBPlane_16",
@@ -11346,7 +12015,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::ConvertToMSBPlane_16",
@@ -11376,7 +12045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane",
@@ -11403,7 +12072,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyPlane_16",
@@ -11430,7 +12099,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::CopyRow_16_C",
@@ -11448,7 +12117,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_AVX",
@@ -11466,7 +12135,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_AVX",
@@ -11484,7 +12153,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_Any_SSE2",
@@ -11502,7 +12171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_C",
@@ -11520,7 +12189,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_ERMS",
@@ -11538,7 +12207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CopyRow_SSE2",
@@ -11556,7 +12225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CpuId",
@@ -11574,7 +12243,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_C",
@@ -11601,7 +12270,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::CumulativeSumToAverageRow_SSE2",
@@ -11628,7 +12297,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetilePlane",
@@ -11657,8 +12326,143 @@
      "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_AVX",
+   "linker_set_key" : "DetileRow_16_AVX",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKt"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    },
+    {
+     "referenced_type" : "_ZTIPt"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::DetileRow_16_Any_AVX",
+   "linker_set_key" : "DetileRow_16_Any_AVX",
+   "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_Any_SSE2",
+   "linker_set_key" : "DetileRow_16_Any_SSE2",
+   "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_SSE2",
+   "linker_set_key" : "DetileRow_16_SSE2",
+   "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_Any_SSE2",
@@ -11679,7 +12483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_C",
@@ -11700,7 +12504,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileRow_SSE2",
@@ -11721,7 +12525,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVPlane",
@@ -11757,7 +12561,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_Any_SSSE3",
@@ -11781,7 +12585,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_C",
@@ -11805,7 +12609,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DetileSplitUVRow_SSSE3",
@@ -11829,7 +12633,124 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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_SSE2",
+   "linker_set_key" : "DetileToYUY2_Any_SSE2",
+   "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_SSE2",
+   "linker_set_key" : "DetileToYUY2_SSE2",
+   "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::DivideRow_16_AVX2",
@@ -11850,7 +12771,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_Any_AVX2",
@@ -11871,7 +12792,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::DivideRow_16_C",
@@ -11892,7 +12813,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_C",
@@ -11907,7 +12828,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv1_X86",
@@ -11922,7 +12843,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_C",
@@ -11937,7 +12858,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::FixedDiv_X86",
@@ -11952,7 +12873,37 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussCol_F32_C",
@@ -11982,7 +12933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GaussPlane_F32",
@@ -12009,7 +12960,25 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::GaussRow_F32_C",
@@ -12027,13 +12996,13 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::GetARGBBlend",
    "linker_set_key" : "GetARGBBlend",
    "return_type" : "_ZTIPFvPKhS0_PhiE",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::H010ToAB30",
@@ -12072,7 +13041,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToABGR",
@@ -12111,7 +13080,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToAR30",
@@ -12150,7 +13119,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H010ToARGB",
@@ -12189,7 +13158,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAB30",
@@ -12228,7 +13197,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToABGR",
@@ -12267,7 +13236,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToAR30",
@@ -12306,7 +13275,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H210ToARGB",
@@ -12345,7 +13314,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAB30",
@@ -12384,7 +13353,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToABGR",
@@ -12423,7 +13392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToAR30",
@@ -12462,7 +13431,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToARGB",
@@ -12501,7 +13470,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRAW",
@@ -12540,7 +13509,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB24",
@@ -12579,7 +13548,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H420ToRGB565",
@@ -12618,7 +13587,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToABGR",
@@ -12657,7 +13626,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H422ToARGB",
@@ -12696,7 +13665,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToABGR",
@@ -12735,7 +13704,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::H444ToARGB",
@@ -12774,7 +13743,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::HalfFloatPlane",
@@ -12804,7 +13773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_AVX2",
@@ -12825,7 +13794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_AVX2",
@@ -12846,7 +13815,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_Any_SSE2",
@@ -12867,7 +13836,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_C",
@@ -12888,7 +13857,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfFloatRow_SSE2",
@@ -12909,7 +13878,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVPlane",
@@ -12942,7 +13911,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_AVX2",
@@ -12969,7 +13938,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_C",
@@ -12996,7 +13965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HalfMergeUVRow_SSSE3",
@@ -13023,7 +13992,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_AVX2",
@@ -13041,7 +14010,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_C",
@@ -13059,7 +14028,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSE42",
@@ -13077,7 +14046,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HammingDistance_SSSE3",
@@ -13095,7 +14064,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2",
@@ -13113,7 +14082,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_C",
@@ -13131,7 +14100,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::HashDjb2_SSE41",
@@ -13149,7 +14118,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrix",
@@ -13200,7 +14169,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010AlphaToARGBMatrixFilter",
@@ -13254,7 +14223,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010Copy",
@@ -13305,7 +14274,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I010ToAB30",
@@ -13344,7 +14367,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToABGR",
@@ -13383,7 +14406,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30",
@@ -13422,7 +14445,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30Matrix",
@@ -13464,7 +14487,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToAR30MatrixFilter",
@@ -13509,7 +14532,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGB",
@@ -13548,7 +14571,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrix",
@@ -13590,7 +14613,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToARGBMatrixFilter",
@@ -13635,7 +14658,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I010ToI410",
@@ -13686,7 +14709,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToI420",
@@ -13737,7 +14760,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I010ToP010",
@@ -13782,7 +14805,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToAR30Matrix",
@@ -13824,7 +14847,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToARGBMatrix",
@@ -13866,7 +14889,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I012ToI420",
@@ -13917,7 +14940,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I012ToP012",
@@ -13962,7 +14985,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrix",
@@ -14013,7 +15036,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBMatrixFilter",
@@ -14067,7 +15090,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210AlphaToARGBRow_C",
@@ -14097,7 +15120,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210Copy",
@@ -14148,7 +15171,61 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I210ToAB30",
@@ -14187,7 +15264,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToABGR",
@@ -14226,7 +15303,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30",
@@ -14265,7 +15342,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Matrix",
@@ -14307,7 +15384,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30MatrixFilter",
@@ -14352,7 +15429,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_AVX2",
@@ -14379,7 +15456,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_AVX2",
@@ -14406,7 +15483,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_Any_SSSE3",
@@ -14433,7 +15510,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_C",
@@ -14460,7 +15537,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToAR30Row_SSSE3",
@@ -14487,7 +15564,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGB",
@@ -14526,7 +15603,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrix",
@@ -14568,7 +15645,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBMatrixFilter",
@@ -14613,7 +15690,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_AVX2",
@@ -14640,7 +15717,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_AVX2",
@@ -14667,7 +15744,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_Any_SSSE3",
@@ -14694,7 +15771,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_C",
@@ -14721,7 +15798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToARGBRow_SSSE3",
@@ -14748,7 +15825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I210ToI010",
@@ -14799,7 +15876,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI410",
@@ -14850,7 +15927,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI420",
@@ -14901,7 +15978,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToI422",
@@ -14952,7 +16029,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I210ToP210",
@@ -14997,7 +16074,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_AVX2",
@@ -15024,7 +16101,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_AVX2",
@@ -15051,7 +16128,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_Any_SSSE3",
@@ -15078,7 +16155,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_C",
@@ -15105,7 +16182,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToAR30Row_SSSE3",
@@ -15132,7 +16209,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_AVX2",
@@ -15159,7 +16236,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_AVX2",
@@ -15186,7 +16263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_Any_SSSE3",
@@ -15213,7 +16290,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_C",
@@ -15240,7 +16317,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I212ToARGBRow_SSSE3",
@@ -15267,7 +16344,58 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I212ToI422",
@@ -15318,7 +16446,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I212ToP212",
@@ -15363,7 +16491,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400Copy",
@@ -15390,7 +16518,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I400Mirror",
@@ -15417,7 +16545,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToARGB",
@@ -15444,7 +16572,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBMatrix",
@@ -15474,7 +16602,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_AVX2",
@@ -15495,7 +16623,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_AVX2",
@@ -15516,7 +16644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_Any_SSE2",
@@ -15537,7 +16665,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_C",
@@ -15558,7 +16686,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToARGBRow_SSE2",
@@ -15579,7 +16707,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I400ToI400",
@@ -15606,7 +16734,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I400ToI420",
@@ -15645,7 +16773,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I400ToNV21",
@@ -15678,7 +16806,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBMatrix",
@@ -15729,7 +16857,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410AlphaToARGBRow_C",
@@ -15759,7 +16887,112 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToAR30Matrix",
@@ -15801,7 +17034,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_AVX2",
@@ -15828,7 +17061,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_AVX2",
@@ -15855,7 +17088,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_Any_SSSE3",
@@ -15882,7 +17115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_C",
@@ -15909,7 +17142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToAR30Row_SSSE3",
@@ -15936,7 +17169,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBMatrix",
@@ -15978,7 +17211,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_AVX2",
@@ -16005,7 +17238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_AVX2",
@@ -16032,7 +17265,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_Any_SSSE3",
@@ -16059,7 +17292,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_C",
@@ -16086,7 +17319,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToARGBRow_SSSE3",
@@ -16113,7 +17346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I410ToI010",
@@ -16164,7 +17397,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I410ToI444",
@@ -16215,7 +17499,58 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I412ToI444",
@@ -16266,7 +17601,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToABGR",
@@ -16314,7 +17649,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGB",
@@ -16362,7 +17697,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrix",
@@ -16413,7 +17748,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420AlphaToARGBMatrixFilter",
@@ -16467,7 +17802,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420Blend",
@@ -16542,7 +17877,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Copy",
@@ -16593,7 +17928,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I420Interpolate",
@@ -16665,7 +18000,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Mirror",
@@ -16716,7 +18051,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Psnr",
@@ -16767,7 +18102,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420Rect",
@@ -16815,7 +18150,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420Rotate",
@@ -16869,7 +18204,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I420Scale",
@@ -16929,7 +18264,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_12",
@@ -16989,7 +18324,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Scale_16",
@@ -17049,7 +18384,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I420Ssim",
@@ -17100,7 +18435,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::I420ToAB30",
@@ -17139,7 +18474,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToABGR",
@@ -17178,7 +18513,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30",
@@ -17217,7 +18552,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToAR30Matrix",
@@ -17259,7 +18594,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB",
@@ -17298,7 +18633,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB1555",
@@ -17337,7 +18672,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGB4444",
@@ -17376,7 +18711,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrix",
@@ -17418,7 +18753,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToARGBMatrixFilter",
@@ -17463,7 +18798,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToBGRA",
@@ -17502,7 +18837,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToI010",
@@ -17553,7 +18888,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI012",
@@ -17604,7 +18939,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI400",
@@ -17643,7 +18978,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I420ToI422",
@@ -17694,7 +19029,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToI444",
@@ -17745,7 +19080,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV12",
@@ -17790,7 +19125,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToNV21",
@@ -17835,7 +19170,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToRAW",
@@ -17874,7 +19209,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24",
@@ -17913,7 +19248,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB24Matrix",
@@ -17955,7 +19290,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I420ToRGB565",
@@ -17994,7 +19374,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Dither",
@@ -18036,7 +19416,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGB565Matrix",
@@ -18078,7 +19458,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBA",
@@ -18117,7 +19497,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToRGBAMatrix",
@@ -18159,7 +19539,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I420ToUYVY",
@@ -18198,7 +19578,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I420ToYUY2",
@@ -18237,7 +19617,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToABGR",
@@ -18285,7 +19665,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGB",
@@ -18333,7 +19713,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrix",
@@ -18384,7 +19764,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBMatrixFilter",
@@ -18438,7 +19818,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_AVX2",
@@ -18468,7 +19848,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_AVX2",
@@ -18498,7 +19878,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_Any_SSSE3",
@@ -18528,7 +19908,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_C",
@@ -18558,7 +19938,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422AlphaToARGBRow_SSSE3",
@@ -18588,7 +19968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422Copy",
@@ -18639,7 +20019,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422Rotate",
@@ -18693,7 +20073,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I422Scale",
@@ -18753,7 +20133,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_12",
@@ -18813,7 +20193,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422Scale_16",
@@ -18873,7 +20253,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I422ToABGR",
@@ -18912,7 +20292,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_AVX2",
@@ -18939,7 +20319,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_AVX2",
@@ -18966,7 +20346,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_Any_SSSE3",
@@ -18993,7 +20373,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_C",
@@ -19020,7 +20400,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToAR30Row_SSSE3",
@@ -19047,7 +20427,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB",
@@ -19086,7 +20466,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_AVX2",
@@ -19113,7 +20493,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_AVX2",
@@ -19140,7 +20520,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_Any_SSSE3",
@@ -19167,7 +20547,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_C",
@@ -19194,7 +20574,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB1555Row_SSSE3",
@@ -19221,7 +20601,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_AVX2",
@@ -19248,7 +20628,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_AVX2",
@@ -19275,7 +20655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_Any_SSSE3",
@@ -19302,7 +20682,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_C",
@@ -19329,7 +20709,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGB4444Row_SSSE3",
@@ -19356,7 +20736,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrix",
@@ -19398,7 +20778,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBMatrixFilter",
@@ -19443,7 +20823,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_AVX2",
@@ -19470,7 +20850,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_AVX2",
@@ -19497,7 +20877,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_Any_SSSE3",
@@ -19524,7 +20904,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_C",
@@ -19551,7 +20931,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToARGBRow_SSSE3",
@@ -19578,7 +20958,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToBGRA",
@@ -19617,7 +20997,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToI210",
@@ -19668,7 +21048,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI420",
@@ -19719,7 +21099,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToI444",
@@ -19770,7 +21150,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I422ToNV21",
@@ -19815,7 +21195,172 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_AVX2",
@@ -19842,7 +21387,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_AVX2",
@@ -19869,7 +21414,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_Any_SSSE3",
@@ -19896,7 +21441,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_C",
@@ -19923,7 +21468,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB24Row_SSSE3",
@@ -19950,7 +21495,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565",
@@ -19989,7 +21534,49 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_AVX2",
@@ -20016,7 +21603,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_AVX2",
@@ -20043,7 +21630,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_Any_SSSE3",
@@ -20070,7 +21657,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_C",
@@ -20097,7 +21684,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGB565Row_SSSE3",
@@ -20124,7 +21711,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBA",
@@ -20163,7 +21750,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBAMatrix",
@@ -20205,7 +21792,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_AVX2",
@@ -20232,7 +21819,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_AVX2",
@@ -20259,7 +21846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_Any_SSSE3",
@@ -20286,7 +21873,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_C",
@@ -20313,7 +21900,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToRGBARow_SSSE3",
@@ -20340,7 +21927,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVY",
@@ -20379,7 +21966,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_AVX2",
@@ -20403,7 +21990,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_AVX2",
@@ -20427,7 +22014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_Any_SSE2",
@@ -20451,7 +22038,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_C",
@@ -20475,7 +22062,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToUYVYRow_SSE2",
@@ -20499,7 +22086,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2",
@@ -20538,7 +22125,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_AVX2",
@@ -20562,7 +22149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_AVX2",
@@ -20586,7 +22173,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_Any_SSE2",
@@ -20610,7 +22197,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_C",
@@ -20634,7 +22221,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I422ToYUY2Row_SSE2",
@@ -20658,7 +22245,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToABGR",
@@ -20706,7 +22293,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGB",
@@ -20754,7 +22341,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBMatrix",
@@ -20805,7 +22392,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_AVX2",
@@ -20835,7 +22422,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_AVX2",
@@ -20865,7 +22452,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_Any_SSSE3",
@@ -20895,7 +22482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_C",
@@ -20925,7 +22512,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444AlphaToARGBRow_SSSE3",
@@ -20955,7 +22542,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444Copy",
@@ -21006,7 +22593,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::I444Rotate",
@@ -21060,7 +22647,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::I444Scale",
@@ -21120,7 +22707,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_12",
@@ -21180,7 +22767,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444Scale_16",
@@ -21240,7 +22827,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::I444ToABGR",
@@ -21279,7 +22866,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGB",
@@ -21318,7 +22905,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBMatrix",
@@ -21360,7 +22947,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_AVX2",
@@ -21387,7 +22974,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_AVX2",
@@ -21414,7 +23001,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_Any_SSSE3",
@@ -21441,7 +23028,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_C",
@@ -21468,7 +23055,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToARGBRow_SSSE3",
@@ -21495,7 +23082,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::I444ToI420",
@@ -21546,7 +23133,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV12",
@@ -21591,7 +23178,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::I444ToNV21",
@@ -21636,13 +23223,268 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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_AVX2",
+   "linker_set_key" : "I444ToRGB24Row_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "I444ToRGB24Row_Any_AVX2",
+   "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_Any_SSSE3",
+   "linker_set_key" : "I444ToRGB24Row_Any_SSSE3",
+   "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_SSSE3",
+   "linker_set_key" : "I444ToRGB24Row_SSSE3",
+   "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::InitCpuFlags",
    "linker_set_key" : "InitCpuFlags",
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane",
@@ -21678,7 +23520,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolatePlane_16",
@@ -21714,7 +23556,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_AVX2",
@@ -21741,7 +23583,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_Any_AVX2",
@@ -21768,7 +23610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16To8_C",
@@ -21795,7 +23637,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_16_C",
@@ -21819,7 +23661,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_AVX2",
@@ -21843,7 +23685,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_AVX2",
@@ -21867,7 +23709,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_Any_SSSE3",
@@ -21891,7 +23733,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_C",
@@ -21915,7 +23757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::InterpolateRow_SSSE3",
@@ -21939,7 +23781,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGB",
@@ -21966,7 +23808,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_Any_SSE2",
@@ -21984,7 +23826,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_C",
@@ -22002,7 +23844,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J400ToARGBRow_SSE2",
@@ -22020,7 +23862,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::J420ToABGR",
@@ -22059,7 +23901,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToARGB",
@@ -22098,7 +23940,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRAW",
@@ -22137,7 +23979,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB24",
@@ -22176,7 +24018,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J420ToRGB565",
@@ -22215,7 +24057,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToABGR",
@@ -22254,7 +24096,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J422ToARGB",
@@ -22293,7 +24135,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToABGR",
@@ -22332,7 +24174,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::J444ToARGB",
@@ -22371,7 +24213,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGSize",
@@ -22392,7 +24234,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToARGB",
@@ -22425,7 +24267,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::MJPGToI420",
@@ -22470,7 +24312,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV12",
@@ -22509,7 +24351,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MJPGToNV21",
@@ -22548,7 +24390,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToI420",
@@ -22593,7 +24435,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::MM21ToNV12",
@@ -22632,7 +24474,79 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MaskCpuFlags",
@@ -22644,7 +24558,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Plane",
@@ -22692,7 +24606,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_AVX2",
@@ -22722,7 +24636,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_Any_AVX2",
@@ -22752,7 +24666,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeAR64Row_C",
@@ -22782,7 +24696,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Plane",
@@ -22830,7 +24744,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_AVX2",
@@ -22860,7 +24774,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_Any_AVX2",
@@ -22890,7 +24804,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGB16To8Row_C",
@@ -22920,7 +24834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBPlane",
@@ -22965,7 +24879,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_AVX2",
@@ -22992,7 +24906,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_AVX2",
@@ -23019,7 +24933,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_Any_SSE2",
@@ -23046,7 +24960,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_C",
@@ -23073,7 +24987,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeARGBRow_SSE2",
@@ -23100,7 +25014,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBPlane",
@@ -23139,7 +25053,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_Any_SSSE3",
@@ -23163,7 +25077,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_C",
@@ -23187,7 +25101,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeRGBRow_SSSE3",
@@ -23211,7 +25125,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane",
@@ -23244,7 +25158,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVPlane_16",
@@ -23280,7 +25194,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_AVX2",
@@ -23304,7 +25218,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_Any_AVX2",
@@ -23328,7 +25242,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_16_C",
@@ -23352,7 +25266,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_AVX2",
@@ -23373,7 +25287,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::MergeUVRow_AVX512BW",
+   "linker_set_key" : "MergeUVRow_AVX512BW",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_AVX2",
@@ -23394,7 +25329,28 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::MergeUVRow_Any_AVX512BW",
+   "linker_set_key" : "MergeUVRow_Any_AVX512BW",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPKh"
+    },
+    {
+     "referenced_type" : "_ZTIPh"
+    },
+    {
+     "referenced_type" : "_ZTIi"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_Any_SSE2",
@@ -23415,7 +25371,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_C",
@@ -23436,7 +25392,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeUVRow_SSE2",
@@ -23457,7 +25413,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Plane",
@@ -23499,7 +25455,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_AVX2",
@@ -23526,7 +25482,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_Any_AVX2",
@@ -23553,7 +25509,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR30Row_C",
@@ -23580,7 +25536,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_AVX2",
@@ -23607,7 +25563,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_Any_AVX2",
@@ -23634,7 +25590,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXR64Row_C",
@@ -23661,7 +25617,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_AVX2",
@@ -23688,7 +25644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_Any_AVX2",
@@ -23715,7 +25671,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGB16To8Row_C",
@@ -23742,7 +25698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_AVX2",
@@ -23766,7 +25722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_AVX2",
@@ -23790,7 +25746,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_Any_SSE2",
@@ -23814,7 +25770,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_C",
@@ -23838,7 +25794,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MergeXRGBRow_SSE2",
@@ -23862,7 +25818,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MipsCpuCaps",
@@ -23874,7 +25830,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "function_name" : "libyuv::MirrorPlane",
@@ -23901,7 +25857,25 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "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"
   },
   {
    "function_name" : "libyuv::MirrorRow_AVX2",
@@ -23919,7 +25893,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_AVX2",
@@ -23937,7 +25911,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_Any_SSSE3",
@@ -23955,7 +25929,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_C",
@@ -23973,7 +25947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorRow_SSSE3",
@@ -23991,7 +25965,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_C",
@@ -24012,7 +25986,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorSplitUVRow_SSSE3",
@@ -24033,7 +26007,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVPlane",
@@ -24060,7 +26034,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_AVX2",
@@ -24078,7 +26052,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_AVX2",
@@ -24096,7 +26070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_Any_SSSE3",
@@ -24114,7 +26088,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_C",
@@ -24132,7 +26106,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MirrorUVRow_SSSE3",
@@ -24150,7 +26124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_AVX2",
@@ -24171,7 +26145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_Any_AVX2",
@@ -24192,7 +26166,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::MultiplyRow_16_C",
@@ -24213,7 +26187,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12Copy",
@@ -24252,7 +26226,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Mirror",
@@ -24291,7 +26265,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV12Scale",
@@ -24339,7 +26313,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::NV12ToABGR",
@@ -24372,7 +26346,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGB",
@@ -24405,7 +26379,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBMatrix",
@@ -24441,7 +26415,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_AVX2",
@@ -24465,7 +26439,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_AVX2",
@@ -24489,7 +26463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_Any_SSSE3",
@@ -24513,7 +26487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_C",
@@ -24537,7 +26511,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToARGBRow_SSSE3",
@@ -24561,7 +26535,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420",
@@ -24606,7 +26580,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToI420Rotate",
@@ -24654,7 +26628,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::NV12ToNV24",
@@ -24693,7 +26667,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV12ToRAW",
@@ -24726,7 +26700,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24",
@@ -24759,7 +26733,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Matrix",
@@ -24795,7 +26769,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_AVX2",
@@ -24819,7 +26793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_AVX2",
@@ -24843,7 +26817,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_Any_SSSE3",
@@ -24867,7 +26841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_C",
@@ -24891,7 +26865,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB24Row_SSSE3",
@@ -24915,7 +26889,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565",
@@ -24948,7 +26922,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Matrix",
@@ -24984,7 +26958,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_AVX2",
@@ -25008,7 +26982,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_AVX2",
@@ -25032,7 +27006,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_Any_SSSE3",
@@ -25056,7 +27030,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_C",
@@ -25080,7 +27054,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV12ToRGB565Row_SSSE3",
@@ -25104,7 +27078,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV16ToNV24",
@@ -25143,7 +27117,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21Copy",
@@ -25182,7 +27156,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToABGR",
@@ -25215,7 +27189,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGB",
@@ -25248,7 +27222,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBMatrix",
@@ -25284,7 +27258,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_AVX2",
@@ -25308,7 +27282,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_AVX2",
@@ -25332,7 +27306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_Any_SSSE3",
@@ -25356,7 +27330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_C",
@@ -25380,7 +27354,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToARGBRow_SSSE3",
@@ -25404,7 +27378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToI420",
@@ -25449,7 +27423,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::NV21ToNV12",
@@ -25488,7 +27462,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::NV21ToRAW",
@@ -25521,7 +27495,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24",
@@ -25554,7 +27528,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Matrix",
@@ -25590,7 +27564,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_AVX2",
@@ -25614,7 +27588,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_AVX2",
@@ -25638,7 +27612,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_Any_SSSE3",
@@ -25662,7 +27636,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_C",
@@ -25686,7 +27660,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToRGB24Row_SSSE3",
@@ -25710,7 +27684,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24",
@@ -25743,7 +27717,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_AVX2",
@@ -25764,7 +27738,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_AVX2",
@@ -25785,7 +27759,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_Any_SSSE3",
@@ -25806,7 +27780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_C",
@@ -25827,7 +27801,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::NV21ToYUV24Row_SSSE3",
@@ -25848,7 +27822,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30Matrix",
@@ -25884,7 +27858,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToAR30MatrixFilter",
@@ -25923,7 +27897,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrix",
@@ -25959,7 +27933,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P010ToARGBMatrixFilter",
@@ -25998,7 +27972,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P010ToP410",
@@ -26037,7 +28056,52 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "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"
   },
   {
    "function_name" : "libyuv::P210ToAR30Matrix",
@@ -26073,7 +28137,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30MatrixFilter",
@@ -26112,7 +28176,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_AVX2",
@@ -26136,7 +28200,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_AVX2",
@@ -26160,7 +28224,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_Any_SSSE3",
@@ -26184,7 +28248,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_C",
@@ -26208,7 +28272,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToAR30Row_SSSE3",
@@ -26232,7 +28296,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrix",
@@ -26268,7 +28332,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBMatrixFilter",
@@ -26307,7 +28371,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_AVX2",
@@ -26331,7 +28395,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_AVX2",
@@ -26355,7 +28419,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_Any_SSSE3",
@@ -26379,7 +28443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_C",
@@ -26403,7 +28467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToARGBRow_SSSE3",
@@ -26427,7 +28491,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P210ToP410",
@@ -26466,7 +28530,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_AVX2",
@@ -26490,7 +28554,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_AVX2",
@@ -26514,7 +28578,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_Any_SSSE3",
@@ -26538,7 +28602,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_C",
@@ -26562,7 +28626,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToAR30Row_SSSE3",
@@ -26586,7 +28650,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_AVX2",
@@ -26610,7 +28674,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_AVX2",
@@ -26634,7 +28698,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_Any_SSSE3",
@@ -26658,7 +28722,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_C",
@@ -26682,7 +28746,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::P410ToARGBRow_SSSE3",
@@ -26706,7 +28770,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGB",
@@ -26733,7 +28797,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_Any_SSSE3",
@@ -26751,7 +28815,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_C",
@@ -26769,7 +28833,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToARGBRow_SSSE3",
@@ -26787,7 +28851,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToI420",
@@ -26826,7 +28890,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ400",
@@ -26853,7 +28917,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJ420",
@@ -26892,7 +28956,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RAWToJNV21",
@@ -26925,7 +28989,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_from_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24",
@@ -26952,7 +29016,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_Any_SSSE3",
@@ -26970,7 +29034,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_C",
@@ -26988,7 +29052,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGB24Row_SSSE3",
@@ -27006,7 +29070,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBA",
@@ -27033,7 +29097,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_Any_SSSE3",
@@ -27051,7 +29115,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_C",
@@ -27069,7 +29133,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToRGBARow_SSSE3",
@@ -27087,7 +29151,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVJRow_C",
@@ -27111,7 +29175,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToUVRow_C",
@@ -27135,7 +29199,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_AVX2",
@@ -27153,7 +29217,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_AVX2",
@@ -27171,7 +29235,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_Any_SSSE3",
@@ -27189,7 +29253,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_C",
@@ -27207,7 +29271,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYJRow_SSSE3",
@@ -27225,7 +29289,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RAWToYRow_C",
@@ -27243,7 +29307,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24Mirror",
@@ -27270,7 +29334,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_Any_SSSE3",
@@ -27288,7 +29352,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_C",
@@ -27306,7 +29370,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24MirrorRow_SSSE3",
@@ -27324,7 +29388,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGB",
@@ -27351,7 +29415,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_Any_SSSE3",
@@ -27369,7 +29433,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_C",
@@ -27387,7 +29451,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToARGBRow_SSSE3",
@@ -27405,7 +29469,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToI420",
@@ -27444,7 +29508,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ400",
@@ -27471,7 +29535,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToJ420",
@@ -27510,7 +29574,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVJRow_C",
@@ -27534,7 +29598,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToUVRow_C",
@@ -27558,7 +29622,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_AVX2",
@@ -27576,7 +29640,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_AVX2",
@@ -27594,7 +29658,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_Any_SSSE3",
@@ -27612,7 +29676,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_C",
@@ -27630,7 +29694,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYJRow_SSSE3",
@@ -27648,7 +29712,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB24ToYRow_C",
@@ -27666,7 +29730,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGB",
@@ -27693,7 +29757,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_Any_SSE2",
@@ -27711,7 +29775,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_C",
@@ -27729,7 +29793,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToARGBRow_SSE2",
@@ -27747,7 +29811,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToI420",
@@ -27786,7 +29850,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGB565ToUVRow_C",
@@ -27810,7 +29874,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGB565ToYRow_C",
@@ -27828,7 +29892,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToARGB",
@@ -27855,7 +29919,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::RGBAToI420",
@@ -27894,7 +29958,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::RGBAToJ400",
@@ -27921,7 +29985,31 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_from_argb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_Any_SSSE3",
@@ -27945,7 +30033,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_C",
@@ -27969,7 +30057,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToUVRow_SSSE3",
@@ -27993,7 +30081,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_AVX2",
@@ -28011,7 +30099,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_AVX2",
@@ -28029,7 +30117,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_Any_SSSE3",
@@ -28047,7 +30135,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_C",
@@ -28065,7 +30153,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYJRow_SSSE3",
@@ -28083,7 +30171,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_Any_SSSE3",
@@ -28101,7 +30189,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_C",
@@ -28119,7 +30207,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBAToYRow_SSSE3",
@@ -28137,7 +30225,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorMatrix",
@@ -28167,7 +30255,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTable",
@@ -28197,7 +30285,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_C",
@@ -28215,7 +30303,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBColorTableRow_X86",
@@ -28233,7 +30321,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::RGBScale",
@@ -28269,7 +30357,19 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_rgb.h"
+   "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"
   },
   {
    "function_name" : "libyuv::RotatePlane",
@@ -28299,7 +30399,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane180",
@@ -28326,7 +30426,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane270",
@@ -28353,7 +30453,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::RotatePlane90",
@@ -28380,7 +30480,37 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "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"
   },
   {
    "function_name" : "libyuv::Scale",
@@ -28440,7 +30570,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols64_C",
@@ -28464,7 +30594,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_C",
@@ -28488,7 +30618,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBColsUp2_SSE2",
@@ -28512,7 +30642,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_C",
@@ -28536,7 +30666,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBCols_SSE2",
@@ -28560,7 +30690,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols64_C",
@@ -28584,7 +30714,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_C",
@@ -28608,7 +30738,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBFilterCols_SSSE3",
@@ -28632,7 +30762,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_Any_SSE2",
@@ -28653,7 +30783,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_C",
@@ -28674,7 +30804,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Box_SSE2",
@@ -28695,7 +30825,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_Any_SSE2",
@@ -28716,7 +30846,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_C",
@@ -28737,7 +30867,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2Linear_SSE2",
@@ -28758,7 +30888,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_Any_SSE2",
@@ -28779,7 +30909,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_C",
@@ -28800,7 +30930,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDown2_SSE2",
@@ -28821,7 +30951,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_Any_SSE2",
@@ -28845,7 +30975,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_C",
@@ -28869,7 +30999,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEvenBox_SSE2",
@@ -28893,7 +31023,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_Any_SSE2",
@@ -28917,7 +31047,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_C",
@@ -28941,7 +31071,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleARGBRowDownEven_SSE2",
@@ -28965,7 +31095,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_16_C",
@@ -28983,7 +31113,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_AVX2",
@@ -29001,7 +31131,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_AVX2",
@@ -29019,7 +31149,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_Any_SSE2",
@@ -29037,7 +31167,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_C",
@@ -29055,7 +31185,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleAddRow_SSE2",
@@ -29073,7 +31203,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_16_C",
@@ -29097,7 +31227,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_C",
@@ -29121,7 +31251,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleColsUp2_SSE2",
@@ -29145,7 +31275,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_16_C",
@@ -29169,7 +31299,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleCols_C",
@@ -29193,7 +31323,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_16_C",
@@ -29217,7 +31347,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols64_C",
@@ -29241,7 +31371,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_16_C",
@@ -29265,7 +31395,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_C",
@@ -29289,7 +31419,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterCols_SSSE3",
@@ -29313,7 +31443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleFilterReduce",
@@ -29337,7 +31467,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv10FilterModeE",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleMaxSamples_C",
@@ -29358,7 +31488,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane",
@@ -29394,7 +31524,46 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical",
@@ -29439,7 +31608,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16",
@@ -29484,7 +31653,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlaneVertical_16To8",
@@ -29532,7 +31701,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_12",
@@ -29568,7 +31737,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "source_file" : "external/libyuv/include/libyuv/scale.h"
   },
   {
    "function_name" : "libyuv::ScalePlane_16",
@@ -29604,7 +31773,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_16_C",
@@ -29625,7 +31842,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_AVX2",
@@ -29646,7 +31863,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_AVX2",
@@ -29667,7 +31884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Any_SSSE3",
@@ -29688,7 +31905,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_C",
@@ -29709,7 +31926,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_AVX2",
@@ -29730,7 +31947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_C",
@@ -29751,7 +31968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_Odd_SSSE3",
@@ -29772,7 +31989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Box_SSSE3",
@@ -29793,7 +32010,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_16_C",
@@ -29814,7 +32079,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_AVX2",
@@ -29835,7 +32100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_AVX2",
@@ -29856,7 +32121,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_Any_SSSE3",
@@ -29877,7 +32142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_C",
@@ -29898,7 +32163,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2Linear_SSSE3",
@@ -29919,7 +32184,55 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_16_C",
@@ -29940,7 +32253,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_AVX2",
@@ -29961,7 +32274,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_AVX2",
@@ -29982,7 +32295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_Any_SSSE3",
@@ -30003,7 +32316,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_C",
@@ -30024,7 +32337,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown2_SSSE3",
@@ -30045,7 +32358,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_16_C",
@@ -30066,7 +32379,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_Any_SSSE3",
@@ -30087,7 +32400,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_C",
@@ -30108,7 +32421,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_0_Box_SSSE3",
@@ -30129,7 +32442,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_16_C",
@@ -30150,7 +32463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_16_C",
@@ -30171,7 +32484,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_Any_SSSE3",
@@ -30192,7 +32505,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_C",
@@ -30213,7 +32526,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_1_Box_SSSE3",
@@ -30234,7 +32547,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_Any_SSSE3",
@@ -30255,7 +32568,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_C",
@@ -30276,7 +32589,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown34_SSSE3",
@@ -30297,7 +32610,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_16_C",
@@ -30318,7 +32631,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_16_C",
@@ -30339,7 +32652,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_Any_SSSE3",
@@ -30360,7 +32673,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_C",
@@ -30381,7 +32694,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_2_Box_SSSE3",
@@ -30402,7 +32715,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_16_C",
@@ -30423,7 +32736,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_Any_SSSE3",
@@ -30444,7 +32757,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_C",
@@ -30465,7 +32778,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_3_Box_SSSE3",
@@ -30486,7 +32799,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_Any_SSSE3",
@@ -30507,7 +32820,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_C",
@@ -30528,7 +32841,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown38_SSSE3",
@@ -30549,7 +32862,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_16_C",
@@ -30570,7 +32883,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_AVX2",
@@ -30591,7 +32904,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_AVX2",
@@ -30612,7 +32925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_Any_SSSE3",
@@ -30633,7 +32946,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_C",
@@ -30654,7 +32967,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4Box_SSSE3",
@@ -30675,7 +32988,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_16_C",
@@ -30696,7 +33009,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_AVX2",
@@ -30717,7 +33030,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_AVX2",
@@ -30738,7 +33051,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_Any_SSSE3",
@@ -30759,7 +33072,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_C",
@@ -30780,7 +33093,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowDown4_SSSE3",
@@ -30801,7 +33114,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_AVX2",
@@ -30825,7 +33138,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_AVX2",
@@ -30849,7 +33162,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_Any_SSSE3",
@@ -30873,7 +33186,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_12_SSSE3",
@@ -30897,7 +33210,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_AVX2",
@@ -30921,7 +33234,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_AVX2",
@@ -30945,7 +33258,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_C",
@@ -30969,7 +33282,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_Any_SSE2",
@@ -30993,7 +33306,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_C",
@@ -31017,7 +33330,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_16_SSE2",
@@ -31041,7 +33354,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_AVX2",
@@ -31065,7 +33378,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_AVX2",
@@ -31089,7 +33402,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_C",
@@ -31113,7 +33426,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSE2",
@@ -31137,7 +33450,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_Any_SSSE3",
@@ -31161,7 +33474,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_C",
@@ -31185,7 +33498,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSE2",
@@ -31209,7 +33522,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Bilinear_SSSE3",
@@ -31233,7 +33546,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_AVX2",
@@ -31251,7 +33564,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_AVX2",
@@ -31269,7 +33582,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_Any_SSSE3",
@@ -31287,7 +33600,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_12_SSSE3",
@@ -31305,7 +33618,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_AVX2",
@@ -31323,7 +33636,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_AVX2",
@@ -31341,7 +33654,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_C",
@@ -31359,7 +33672,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_Any_SSE2",
@@ -31377,7 +33690,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_C",
@@ -31395,7 +33708,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_16_SSE2",
@@ -31413,7 +33726,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_AVX2",
@@ -31431,7 +33744,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_AVX2",
@@ -31449,7 +33762,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_C",
@@ -31467,7 +33780,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSE2",
@@ -31485,7 +33798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_Any_SSSE3",
@@ -31503,7 +33816,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_C",
@@ -31521,7 +33834,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSE2",
@@ -31539,7 +33852,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleRowUp2_Linear_SSSE3",
@@ -31557,7 +33870,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSamples_C",
@@ -31578,7 +33891,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleSlope",
@@ -31614,7 +33927,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleSumSamples_C",
@@ -31635,7 +33948,7 @@
     }
    ],
    "return_type" : "_ZTIf",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols64_C",
@@ -31659,7 +33972,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVColsUp2_C",
@@ -31683,7 +33996,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVCols_C",
@@ -31707,7 +34020,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols64_C",
@@ -31731,7 +34044,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVFilterCols_C",
@@ -31755,7 +34068,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_AVX2",
@@ -31776,7 +34089,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_AVX2",
@@ -31797,7 +34110,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_Any_SSSE3",
@@ -31818,7 +34131,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_C",
@@ -31839,7 +34152,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Box_SSSE3",
@@ -31860,7 +34173,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2Linear_C",
@@ -31881,7 +34194,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDown2_C",
@@ -31902,7 +34215,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEvenBox_C",
@@ -31926,7 +34239,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowDownEven_C",
@@ -31950,7 +34263,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_AVX2",
@@ -31974,7 +34287,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_AVX2",
@@ -31998,7 +34311,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_C",
@@ -32022,7 +34335,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_Any_SSE41",
@@ -32046,7 +34359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_C",
@@ -32070,7 +34383,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_16_SSE41",
@@ -32094,7 +34407,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_AVX2",
@@ -32118,7 +34431,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_AVX2",
@@ -32142,7 +34455,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_C",
@@ -32166,7 +34479,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_Any_SSSE3",
@@ -32190,7 +34503,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_C",
@@ -32214,7 +34527,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Bilinear_SSSE3",
@@ -32238,7 +34551,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_AVX2",
@@ -32256,7 +34569,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_AVX2",
@@ -32274,7 +34587,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_C",
@@ -32292,7 +34605,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_Any_SSE41",
@@ -32310,7 +34623,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_C",
@@ -32328,7 +34641,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_16_SSE41",
@@ -32346,7 +34659,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_AVX2",
@@ -32364,7 +34677,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_AVX2",
@@ -32382,7 +34695,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_C",
@@ -32400,7 +34713,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_Any_SSSE3",
@@ -32418,7 +34731,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_C",
@@ -32436,7 +34749,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::ScaleUVRowUp2_Linear_SSSE3",
@@ -32454,7 +34767,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/scale_row.h"
   },
   {
    "function_name" : "libyuv::SetPlane",
@@ -32478,7 +34791,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SetRow_Any_X86",
@@ -32496,7 +34809,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_C",
@@ -32514,7 +34827,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_ERMS",
@@ -32532,7 +34845,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SetRow_X86",
@@ -32550,7 +34863,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_Any_SSE2",
@@ -32571,7 +34884,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_C",
@@ -32592,7 +34905,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelRow_SSE2",
@@ -32613,7 +34926,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_Any_SSE2",
@@ -32634,7 +34947,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_C",
@@ -32655,7 +34968,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelToPlaneRow_SSE2",
@@ -32676,7 +34989,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_C",
@@ -32700,7 +35013,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXRow_SSE2",
@@ -32724,7 +35037,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_Any_SSE2",
@@ -32745,7 +35058,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_C",
@@ -32766,7 +35079,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelXYRow_SSE2",
@@ -32787,7 +35100,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_C",
@@ -32808,7 +35121,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SobelYRow_SSE2",
@@ -32829,7 +35142,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBPlane",
@@ -32874,7 +35187,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_AVX2",
@@ -32901,7 +35214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_AVX2",
@@ -32928,7 +35241,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSE2",
@@ -32955,7 +35268,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_Any_SSSE3",
@@ -32982,7 +35295,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_C",
@@ -33009,7 +35322,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSE2",
@@ -33036,7 +35349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitARGBRow_SSSE3",
@@ -33063,7 +35376,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBPlane",
@@ -33102,7 +35415,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_Any_SSSE3",
@@ -33126,7 +35439,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_C",
@@ -33150,7 +35463,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRGBRow_SSSE3",
@@ -33174,7 +35487,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV",
@@ -33210,7 +35523,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV180",
@@ -33243,7 +35556,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV270",
@@ -33276,7 +35589,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitRotateUV90",
@@ -33309,7 +35622,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitTransposeUV",
@@ -33342,7 +35655,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane",
@@ -33375,7 +35688,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVPlane_16",
@@ -33411,7 +35724,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_AVX2",
@@ -33435,7 +35748,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_Any_AVX2",
@@ -33459,7 +35772,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_16_C",
@@ -33483,7 +35796,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_AVX2",
@@ -33504,7 +35817,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_AVX2",
@@ -33525,7 +35838,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_Any_SSE2",
@@ -33546,7 +35859,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_C",
@@ -33567,7 +35880,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitUVRow_SSE2",
@@ -33588,7 +35901,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_AVX2",
@@ -33612,7 +35925,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_AVX2",
@@ -33636,7 +35949,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSE2",
@@ -33660,7 +35973,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_Any_SSSE3",
@@ -33684,7 +35997,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_C",
@@ -33708,7 +36021,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSE2",
@@ -33732,7 +36045,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SplitXRGBRow_SSSE3",
@@ -33756,7 +36069,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SumSquareErrorToPsnr",
@@ -33771,7 +36084,7 @@
     }
    ],
    "return_type" : "_ZTId",
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_C",
@@ -33789,7 +36102,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SumSquareError_SSE2",
@@ -33807,7 +36120,7 @@
     }
    ],
    "return_type" : "_ZTIj",
-   "source_file" : "external/libyuv/files/include/libyuv/compare_row.h"
+   "source_file" : "external/libyuv/include/libyuv/compare_row.h"
   },
   {
    "function_name" : "libyuv::SwapUVPlane",
@@ -33834,7 +36147,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_AVX2",
@@ -33852,7 +36165,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_AVX2",
@@ -33870,7 +36183,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_Any_SSSE3",
@@ -33888,7 +36201,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_C",
@@ -33906,7 +36219,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::SwapUVRow_SSSE3",
@@ -33924,7 +36237,79 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
+  },
+  {
+   "function_name" : "libyuv::Transpose4x4_32_AVX2",
+   "linker_set_key" : "Transpose4x4_32_AVX2",
+   "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_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_SSE2",
+   "linker_set_key" : "Transpose4x4_32_SSE2",
+   "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::TransposePlane",
@@ -33951,7 +36336,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWx8_C",
@@ -33981,7 +36366,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeUVWxH_C",
@@ -34014,7 +36399,31 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWx8_Any_SSSE3",
@@ -34038,7 +36447,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_C",
@@ -34062,7 +36471,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::TransposeWx8_SSSE3",
@@ -34086,7 +36495,34 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "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"
   },
   {
    "function_name" : "libyuv::TransposeWxH_C",
@@ -34113,7 +36549,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/rotate_row.h"
+   "source_file" : "external/libyuv/include/libyuv/rotate_row.h"
   },
   {
    "function_name" : "libyuv::U010ToAB30",
@@ -34152,7 +36588,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToABGR",
@@ -34191,7 +36627,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToAR30",
@@ -34230,7 +36666,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U010ToARGB",
@@ -34269,7 +36705,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAB30",
@@ -34308,7 +36744,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToABGR",
@@ -34347,7 +36783,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToAR30",
@@ -34386,7 +36822,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U210ToARGB",
@@ -34425,7 +36861,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToABGR",
@@ -34464,7 +36900,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U420ToARGB",
@@ -34503,7 +36939,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToABGR",
@@ -34542,7 +36978,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U422ToARGB",
@@ -34581,7 +37017,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToABGR",
@@ -34620,7 +37056,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::U444ToARGB",
@@ -34659,7 +37095,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGB",
@@ -34686,7 +37122,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_AVX2",
@@ -34707,7 +37143,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_AVX2",
@@ -34728,7 +37164,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_Any_SSSE3",
@@ -34749,7 +37185,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_C",
@@ -34770,7 +37206,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToARGBRow_SSSE3",
@@ -34791,7 +37227,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToI420",
@@ -34830,7 +37266,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::UYVYToI422",
@@ -34869,7 +37305,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToNV12",
@@ -34902,7 +37338,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_AVX2",
@@ -34923,7 +37359,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_AVX2",
@@ -34944,7 +37380,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_Any_SSE2",
@@ -34965,7 +37401,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_C",
@@ -34986,7 +37422,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUV422Row_SSE2",
@@ -35007,7 +37443,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_AVX2",
@@ -35031,7 +37467,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_AVX2",
@@ -35055,7 +37491,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_Any_SSE2",
@@ -35079,7 +37515,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_C",
@@ -35103,7 +37539,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToUVRow_SSE2",
@@ -35127,7 +37563,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToY",
@@ -35154,7 +37590,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_AVX2",
@@ -35172,7 +37608,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_AVX2",
@@ -35190,7 +37626,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_Any_SSE2",
@@ -35208,7 +37644,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_C",
@@ -35226,7 +37662,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::UYVYToYRow_SSE2",
@@ -35244,7 +37680,25 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "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::ValidateJpeg",
@@ -35259,7 +37713,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGB",
@@ -35286,7 +37740,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_AVX2",
@@ -35307,7 +37761,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_AVX2",
@@ -35328,7 +37782,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_Any_SSSE3",
@@ -35349,7 +37803,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_C",
@@ -35370,7 +37824,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToARGBRow_SSSE3",
@@ -35391,7 +37845,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI420",
@@ -35430,7 +37884,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "function_name" : "libyuv::YUY2ToI422",
@@ -35469,7 +37923,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToNV12",
@@ -35502,7 +37956,112 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
+  },
+  {
+   "function_name" : "libyuv::YUY2ToNVUVRow_AVX2",
+   "linker_set_key" : "YUY2ToNVUVRow_AVX2",
+   "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_Any_AVX2",
+   "linker_set_key" : "YUY2ToNVUVRow_Any_AVX2",
+   "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_Any_SSE2",
+   "linker_set_key" : "YUY2ToNVUVRow_Any_SSE2",
+   "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_SSE2",
+   "linker_set_key" : "YUY2ToNVUVRow_SSE2",
+   "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::YUY2ToUV422Row_AVX2",
@@ -35523,7 +38082,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_AVX2",
@@ -35544,7 +38103,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_Any_SSE2",
@@ -35565,7 +38124,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_C",
@@ -35586,7 +38145,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUV422Row_SSE2",
@@ -35607,7 +38166,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_AVX2",
@@ -35631,7 +38190,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_AVX2",
@@ -35655,7 +38214,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_Any_SSE2",
@@ -35679,7 +38238,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_C",
@@ -35703,7 +38262,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToUVRow_SSE2",
@@ -35727,7 +38286,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToY",
@@ -35754,7 +38313,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_AVX2",
@@ -35772,7 +38331,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_AVX2",
@@ -35790,7 +38349,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_Any_SSE2",
@@ -35808,7 +38367,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_C",
@@ -35826,7 +38385,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "function_name" : "libyuv::YUY2ToYRow_SSE2",
@@ -35844,7 +38403,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "access" : "private",
@@ -35858,7 +38417,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::UnloadFrame",
@@ -35871,7 +38430,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -35885,7 +38444,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetColorSpace",
@@ -35898,7 +38457,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToBuffers",
@@ -35920,7 +38479,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::DecodeToCallback",
@@ -35945,7 +38504,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentSize",
@@ -35961,7 +38520,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetNumComponents",
@@ -35974,7 +38533,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentWidth",
@@ -35990,7 +38549,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSampFactor",
@@ -36006,7 +38565,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -36023,7 +38582,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentHeight",
@@ -36039,7 +38598,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentStride",
@@ -36055,7 +38614,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSampFactor",
@@ -36071,7 +38630,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -36088,7 +38647,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "access" : "private",
@@ -36102,7 +38661,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetVertSubSampFactor",
@@ -36118,7 +38677,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHorizSubSampFactor",
@@ -36134,7 +38693,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::JpegSubsamplingTypeHelper",
@@ -36152,7 +38711,7 @@
     }
    ],
    "return_type" : "_ZTIN6libyuv19JpegSubsamplingTypeE",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetImageScanlinesPerImcuRow",
@@ -36165,7 +38724,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetComponentScanlinesPerImcuRow",
@@ -36181,7 +38740,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetWidth",
@@ -36194,7 +38753,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::GetHeight",
@@ -36207,7 +38766,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::LoadFrame",
@@ -36226,7 +38785,7 @@
     }
    ],
    "return_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -36239,7 +38798,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::MJpegDecoder",
@@ -36252,7 +38811,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -36265,7 +38824,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "function_name" : "libyuv::MJpegDecoder::~MJpegDecoder",
@@ -36278,7 +38837,7 @@
     }
    ],
    "return_type" : "_ZTIv",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "global_vars" :
@@ -36287,121 +38846,121 @@
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder14kColorSpaceRgbE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceRgb",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceCMYKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceCMYK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder15kColorSpaceYCCKE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCCK",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder16kColorSpaceYCbCrE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceYCbCr",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder18kColorSpaceUnknownE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceUnknown",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "_ZN6libyuv12MJpegDecoder20kColorSpaceGrayscaleE",
    "name" : "libyuv::MJpegDecoder::kColorSpaceGrayscale",
    "referenced_type" : "_ZTIKi",
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "linker_set_key" : "cpu_info_",
    "name" : "libyuv::cpu_info_",
    "referenced_type" : "_ZTIi",
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "linker_set_key" : "fixed_invtbl8",
    "name" : "libyuv::fixed_invtbl8",
    "referenced_type" : "_ZTIA256_Kj",
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "linker_set_key" : "kYuv2020Constants",
    "name" : "libyuv::kYuv2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvF709Constants",
    "name" : "libyuv::kYuvF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvH709Constants",
    "name" : "libyuv::kYuvH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvI601Constants",
    "name" : "libyuv::kYuvI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvJPEGConstants",
    "name" : "libyuv::kYuvJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYuvV2020Constants",
    "name" : "libyuv::kYuvV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvu2020Constants",
    "name" : "libyuv::kYvu2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuF709Constants",
    "name" : "libyuv::kYvuF709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuH709Constants",
    "name" : "libyuv::kYvuH709Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuI601Constants",
    "name" : "libyuv::kYvuI601Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuJPEGConstants",
    "name" : "libyuv::kYvuJPEGConstants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "linker_set_key" : "kYvuV2020Constants",
    "name" : "libyuv::kYvuV2020Constants",
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   }
  ],
  "lvalue_reference_types" : [],
@@ -36414,7 +38973,7 @@
    "referenced_type" : "_ZTI15jpeg_source_mgr",
    "self_type" : "_ZTIP15jpeg_source_mgr",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36423,7 +38982,7 @@
    "referenced_type" : "_ZTI22jpeg_decompress_struct",
    "self_type" : "_ZTIP22jpeg_decompress_struct",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36432,7 +38991,7 @@
    "referenced_type" : "_ZTIFvPKhS0_PhiE",
    "self_type" : "_ZTIPFvPKhS0_PhiE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -36441,7 +39000,7 @@
    "referenced_type" : "_ZTIFvPvPKPKhPKiiE",
    "self_type" : "_ZTIPFvPvPKPKhPKiiE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36450,7 +39009,7 @@
    "referenced_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIPKN6libyuv12YuvConstantsE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -36459,7 +39018,7 @@
    "referenced_type" : "_ZTIKPKh",
    "self_type" : "_ZTIPKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36468,7 +39027,7 @@
    "referenced_type" : "_ZTIKa",
    "self_type" : "_ZTIPKa",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -36477,7 +39036,7 @@
    "referenced_type" : "_ZTIKc",
    "self_type" : "_ZTIPKc",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -36486,7 +39045,7 @@
    "referenced_type" : "_ZTIKf",
    "self_type" : "_ZTIPKf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -36495,7 +39054,7 @@
    "referenced_type" : "_ZTIKh",
    "self_type" : "_ZTIPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -36504,7 +39063,16 @@
    "referenced_type" : "_ZTIKi",
    "self_type" : "_ZTIPKi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "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"
   },
   {
    "alignment" : 4,
@@ -36513,7 +39081,7 @@
    "referenced_type" : "_ZTIKt",
    "self_type" : "_ZTIPKt",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -36522,7 +39090,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIPN6libyuv12MJpegDecoderE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36531,7 +39099,7 @@
    "referenced_type" : "_ZTIN6libyuv14SetJmpErrorMgrE",
    "self_type" : "_ZTIPN6libyuv14SetJmpErrorMgrE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36540,7 +39108,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIPN6libyuv6BufferE",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36549,7 +39117,7 @@
    "referenced_type" : "_ZTIPPh",
    "self_type" : "_ZTIPPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36558,7 +39126,7 @@
    "referenced_type" : "_ZTIPh",
    "self_type" : "_ZTIPPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36567,7 +39135,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIPf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 4,
@@ -36576,7 +39144,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIPh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -36585,7 +39153,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIPi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36594,7 +39162,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIPj",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/scale_row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -36603,7 +39171,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIPt",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   },
   {
    "alignment" : 4,
@@ -36612,7 +39180,7 @@
    "referenced_type" : "_ZTIv",
    "self_type" : "_ZTIPv",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "qualified_types" :
@@ -36625,7 +39193,7 @@
    "referenced_type" : "_ZTIA256_j",
    "self_type" : "_ZTIA256_Kj",
    "size" : 1024,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 2,
@@ -36635,7 +39203,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIKN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/files/include/libyuv/convert_argb.h"
+   "source_file" : "external/libyuv/include/libyuv/convert_argb.h"
   },
   {
    "alignment" : 4,
@@ -36645,7 +39213,7 @@
    "referenced_type" : "_ZTIPKh",
    "self_type" : "_ZTIKPKh",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 1,
@@ -36655,7 +39223,7 @@
    "referenced_type" : "_ZTIa",
    "self_type" : "_ZTIKa",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -36665,7 +39233,7 @@
    "referenced_type" : "_ZTIc",
    "self_type" : "_ZTIKc",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/cpu_id.h"
+   "source_file" : "external/libyuv/include/libyuv/cpu_id.h"
   },
   {
    "alignment" : 4,
@@ -36675,7 +39243,7 @@
    "referenced_type" : "_ZTIf",
    "self_type" : "_ZTIKf",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/planar_functions.h"
+   "source_file" : "external/libyuv/include/libyuv/planar_functions.h"
   },
   {
    "alignment" : 1,
@@ -36685,7 +39253,7 @@
    "referenced_type" : "_ZTIh",
    "self_type" : "_ZTIKh",
    "size" : 1,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -36695,7 +39263,7 @@
    "referenced_type" : "_ZTIi",
    "self_type" : "_ZTIKi",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/compare.h"
+   "source_file" : "external/libyuv/include/libyuv/compare.h"
   },
   {
    "alignment" : 4,
@@ -36705,7 +39273,7 @@
    "referenced_type" : "_ZTIj",
    "self_type" : "_ZTIKj",
    "size" : 4,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -36715,7 +39283,7 @@
    "referenced_type" : "_ZTIt",
    "self_type" : "_ZTIKt",
    "size" : 2,
-   "source_file" : "external/libyuv/files/include/libyuv/convert.h"
+   "source_file" : "external/libyuv/include/libyuv/convert.h"
   }
  ],
  "record_types" :
@@ -36744,7 +39312,7 @@
    "referenced_type" : "_ZTIN6libyuv12BufferVectorE",
    "self_type" : "_ZTIN6libyuv12BufferVectorE",
    "size" : 12,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 4,
@@ -36822,7 +39390,7 @@
    "referenced_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "self_type" : "_ZTIN6libyuv12MJpegDecoderE",
    "size" : 56,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   },
   {
    "alignment" : 2,
@@ -36858,7 +39426,7 @@
    "referenced_type" : "_ZTIN6libyuv12YuvConstantsE",
    "self_type" : "_ZTIN6libyuv12YuvConstantsE",
    "size" : 160,
-   "source_file" : "external/libyuv/files/include/libyuv/row.h"
+   "source_file" : "external/libyuv/include/libyuv/row.h"
   },
   {
    "alignment" : 4,
@@ -36879,7 +39447,7 @@
    "referenced_type" : "_ZTIN6libyuv6BufferE",
    "self_type" : "_ZTIN6libyuv6BufferE",
    "size" : 8,
-   "source_file" : "external/libyuv/files/include/libyuv/mjpeg_decoder.h"
+   "source_file" : "external/libyuv/include/libyuv/mjpeg_decoder.h"
   }
  ],
  "rvalue_reference_types" : []